Browse Source

【打印】小册子 - 数据串接

lizhe 1 year ago
parent
commit
b530e6ed84

+ 8 - 3
PDF Office/PDF Master/Class/PDFTools/Print/KMPrintWindowController.swift

@@ -28,7 +28,7 @@ class KMPrintWindowController: NSWindowController, NetServiceBrowserDelegate {
     
     var chooseData: KMPrintModel = KMPrintModel() {
         didSet {
-            self.preview.model = chooseData
+            self.reloadData()
         }
     }
     
@@ -36,6 +36,7 @@ class KMPrintWindowController: NSWindowController, NetServiceBrowserDelegate {
     var presenter: KMPrintPresenter = KMPrintPresenter()
     var printType: KMPrintModelType = .size {
         didSet {
+            self.chooseData.page.operation.type = printType
             self.reloadData()
         }
     }
@@ -55,7 +56,7 @@ class KMPrintWindowController: NSWindowController, NetServiceBrowserDelegate {
                 self.preview.pdfDocument = pdfDocument
                 self.pdfDocument = pdfDocument
                 
-                self.presenter.initPresenter(delegate: self, data: self.chooseView.outputData, document: pdfDocument!)
+                self.presenter.initPresenter(delegate: self, data: self.chooseData, document: pdfDocument!)
             }
         }
     }
@@ -67,7 +68,7 @@ class KMPrintWindowController: NSWindowController, NetServiceBrowserDelegate {
             
             if pdfDocument != nil {
                 self.preview.pdfDocument = pdfDocument
-                self.presenter.initPresenter(delegate: self, data: self.chooseView.outputData, document: pdfDocument!)
+                self.presenter.initPresenter(delegate: self, data: self.chooseData, document: pdfDocument!)
             }
         }
     }
@@ -115,6 +116,10 @@ class KMPrintWindowController: NSWindowController, NetServiceBrowserDelegate {
     
     func reloadData() {
         guard let bottomView = bottomView else { return }
+        
+        self.preview.model = chooseData
+        self.settingView.printModel = chooseData
+        
         self.bottomView.type = printType
         self.settingView.type = printType
     }

+ 15 - 3
PDF Office/PDF Master/Class/PDFTools/Print/Presenter/KMPrintPresenter.swift

@@ -157,6 +157,8 @@ extension KMPrintPresenter: KMPrintPresenterDocument {
                         } else if (pageModel.operation.poster.type == .breakUp) {
                             pageShowRect = pageCropRect
                         }
+                    } else if pageModel.operation.type == .pamphlet {
+                        
                     }
                     drawPage.cropRect = pageCropRect
                     drawPage.showRect = pageShowRect
@@ -745,6 +747,8 @@ extension KMPrintPresenter: KMPrintPresenterPaper {
                 count = Int(pageModel.operation.pageOfPaper.point.x * pageModel.operation.pageOfPaper.point.y)
             case .poster:
                 count = Int(pageModel.operation.pageOfPaper.point.x * pageModel.operation.pageOfPaper.point.y)
+            case .pamphlet:
+                count = 2
             default:
                 count = 1
         }
@@ -761,9 +765,9 @@ extension KMPrintPresenter: KMPrintPresenterPaper {
         var count = 1
         let pageOfPaper = self.fetchPageOfPaper(pageModel)
         switch pageModel.operation.type {
-            case .multipage:
+        case .multipage:
             count = Int(ceilf(Float(pages.count / pageOfPaper)))
-            case .poster:
+        case .poster:
             if (pageModel.operation.poster.type == .tile) {
                 //1 2 4 9 16
                 let scale = pageModel.operation.poster.scale
@@ -778,7 +782,15 @@ extension KMPrintPresenter: KMPrintPresenterPaper {
             } else {
                 count = Int(ceilf(Float(pages.count / pageOfPaper)))
             }
-            default:
+        case .pamphlet: do {
+            let temp = pages.count%2
+            if temp == 0 {
+                count = pages.count / 2
+            } else {
+                count = pages.count / 2 + 1
+            }
+        }
+        default:
             count = Int(ceilf(Float(pages.count / pageOfPaper)))
         }
         return count

+ 5 - 1
PDF Office/PDF Master/Class/PDFTools/Print/View/Preview/KMPrintPreviewView.swift

@@ -23,7 +23,11 @@ class KMPrintPreviewView: KMBaseXibView {
     @IBOutlet weak var partitionLabel: NSTextField!
     
     var isPrintPreView: Bool = true
-    var model: KMPrintModel?
+    var model: KMPrintModel? {
+        didSet {
+            self.reloadData()
+        }
+    }
     
     private lazy var presenter: KMPrintPreviewPresenter = KMPrintPreviewPresenter()
     var pdfDocument: CPDFDocument? {

+ 9 - 0
PDF Office/PDF Master/Class/PDFTools/Print/View/PrintSettingView/KMPrintSettingView.swift

@@ -25,6 +25,15 @@ class KMPrintSettingView: KMBaseXibView {
         }
     }
     
+    var printModel: KMPrintModel = KMPrintModel() {
+        didSet {
+            self.defaultView.printModel = printModel
+            self.posterView.printModel = printModel
+            self.multipageView.printModel = printModel
+            self.pamphletView.printModel = printModel
+        }
+    }
+    
     override func setup() {
         defaultView.pageSettingChange = { [unowned self] view, model in
             self.pageSettingChange?(self, model)

+ 6 - 0
PDF Office/PDF Master/Class/PDFTools/Print/View/PrintSettingView/View/Custom/KMPrintDefaultView.swift

@@ -30,6 +30,12 @@ class KMPrintDefaultView: KMBaseXibView {
     
     
     lazy var viewModel: KMPrintViewModel = KMPrintViewModel()
+    var printModel: KMPrintModel = KMPrintModel() {
+        didSet {
+            self.viewModel.model = printModel
+            self.reloadData()
+        }
+    }
     
     var pageSettingChange: KMPrintDefaultViewPageSettingChange?
     var printSettingChange: KMPrintDefaultViewPrintSettingChange?

+ 7 - 0
PDF Office/PDF Master/Class/PDFTools/Print/View/PrintSettingView/View/Multipage/KMPrintMultipageView.swift

@@ -78,6 +78,13 @@ class KMPrintMultipageView: KMBaseXibView, NSComboBoxDelegate {
     
     lazy var viewModel: KMPrintViewModel = KMPrintViewModel()
     
+    var printModel: KMPrintModel = KMPrintModel() {
+        didSet {
+            self.viewModel.model = printModel
+            self.reloadData()
+        }
+    }
+    
     override func draw(_ dirtyRect: NSRect) {
         super.draw(dirtyRect)
 

+ 38 - 38
PDF Office/PDF Master/Class/PDFTools/Print/View/PrintSettingView/View/Multipage/KMPrintMultipageView.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22155" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22155"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -62,7 +62,7 @@
             <rect key="frame" x="0.0" y="0.0" width="480" height="603"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="eWn-mO-UXt">
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="eWn-mO-UXt">
                     <rect key="frame" x="14" y="569" width="33" height="16"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Unit:" id="Xe4-2v-cK2">
                         <font key="font" metaFont="system"/>
@@ -70,7 +70,7 @@
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
-                <comboBox focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="vHW-yv-3oc">
+                <comboBox verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="vHW-yv-3oc">
                     <rect key="frame" x="49" y="565" width="54" height="23"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="50" id="2wN-jO-bWd"/>
@@ -95,7 +95,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="448" height="46"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="kcd-xe-BYi">
+                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="kcd-xe-BYi">
                                 <rect key="frame" x="8" y="30" width="66" height="16"/>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Page size:" id="Upk-L3-mZb">
                                     <font key="font" metaFont="system"/>
@@ -103,7 +103,7 @@
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
-                            <comboBox focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Mgj-8l-Esr">
+                            <comboBox verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Mgj-8l-Esr">
                                 <rect key="frame" x="9" y="-2" width="144" height="23"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="140" id="R3T-i3-ZcE"/>
@@ -117,7 +117,7 @@
                                     <action selector="comboBoxItemClickSplitSize:" target="-2" id="SVH-FW-JoS"/>
                                 </connections>
                             </comboBox>
-                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="gwU-Pj-JIm">
+                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="gwU-Pj-JIm">
                                 <rect key="frame" x="223" y="3" width="11" height="16"/>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="x" id="2ye-bT-g5l">
                                     <font key="font" metaFont="system"/>
@@ -125,7 +125,7 @@
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
-                            <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="RpY-e7-Ywn">
+                            <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="RpY-e7-Ywn">
                                 <rect key="frame" x="170" y="-1" width="50" height="22"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="50" id="Wqo-kk-bGL"/>
@@ -137,7 +137,7 @@
                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
-                            <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="mYL-4m-ics">
+                            <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="mYL-4m-ics">
                                 <rect key="frame" x="237" y="-1" width="50" height="22"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="50" id="B0h-Zw-kIS"/>
@@ -149,7 +149,7 @@
                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
-                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="xLX-m1-pqf">
+                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="xLX-m1-pqf">
                                 <rect key="frame" x="287" y="2" width="27" height="16"/>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="mm" id="aod-Cu-123">
                                     <font key="font" metaFont="system"/>
@@ -183,7 +183,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="448" height="94"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="74u-uo-wdo">
+                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="74u-uo-wdo">
                                 <rect key="frame" x="8" y="78" width="76" height="16"/>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Orientation:" id="MFU-xZ-6RL">
                                     <font key="font" metaFont="system"/>
@@ -241,7 +241,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="448" height="56"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2Ym-Le-xJN">
+                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2Ym-Le-xJN">
                                 <rect key="frame" x="8" y="40" width="77" height="16"/>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Page Range" id="6an-s3-NTr">
                                     <font key="font" metaFont="system"/>
@@ -249,7 +249,7 @@
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
-                            <comboBox focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="KHI-bT-4hf">
+                            <comboBox verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="KHI-bT-4hf">
                                 <rect key="frame" x="9" y="8" width="244" height="23"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="240" id="sAD-UV-se5"/>
@@ -280,7 +280,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="448" height="132"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="QqD-gY-2tE">
+                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="QqD-gY-2tE">
                                 <rect key="frame" x="8" y="114" width="106" height="16"/>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Pages per sheet:" id="kPj-H7-cLu">
                                     <font key="font" metaFont="system"/>
@@ -288,7 +288,7 @@
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
-                            <comboBox focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1DH-zr-Q1C">
+                            <comboBox verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1DH-zr-Q1C">
                                 <rect key="frame" x="116" y="110" width="84" height="23"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="80" id="cQu-6p-6T3"/>
@@ -312,7 +312,7 @@
                                     <action selector="buttonItemClickPageBorder:" target="-2" id="o2y-31-yLh"/>
                                 </connections>
                             </button>
-                            <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="EAB-H4-O5b">
+                            <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="EAB-H4-O5b">
                                 <rect key="frame" x="212" y="111" width="30" height="21"/>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="B2y-EG-F6H">
                                     <numberFormatter key="formatter" formatterBehavior="default10_4" usesGroupingSeparator="NO" groupingSize="0" minimumIntegerDigits="0" maximumIntegerDigits="42" id="csT-0b-YWk">
@@ -324,7 +324,7 @@
                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
-                            <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ZkM-1Q-BLA">
+                            <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ZkM-1Q-BLA">
                                 <rect key="frame" x="267" y="111" width="30" height="21"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="30" id="7U4-yB-1nk"/>
@@ -339,7 +339,7 @@
                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
-                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="kDa-XV-GoX">
+                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="kDa-XV-GoX">
                                 <rect key="frame" x="245" y="114" width="19" height="16"/>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="by" id="UaW-JA-8k8">
                                     <font key="font" metaFont="system"/>
@@ -347,7 +347,7 @@
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
-                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9Z7-jE-CkX">
+                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9Z7-jE-CkX">
                                 <rect key="frame" x="8" y="84" width="75" height="16"/>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Page order:" id="YLc-pd-nvO">
                                     <font key="font" metaFont="system"/>
@@ -355,7 +355,7 @@
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
-                            <comboBox focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="TGw-9s-c6J">
+                            <comboBox verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="TGw-9s-c6J">
                                 <rect key="frame" x="85" y="80" width="204" height="23"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="200" id="cI3-nw-oMi"/>
@@ -379,7 +379,7 @@
                                     <action selector="buttonItemClickReversePage:" target="-2" id="587-1w-z2r"/>
                                 </connections>
                             </button>
-                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="gwQ-MD-KhF">
+                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="gwQ-MD-KhF">
                                 <rect key="frame" x="8" y="54" width="128" height="16"/>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Comments &amp; Forms:" id="c4i-Mh-Mal">
                                     <font key="font" metaFont="system"/>
@@ -387,7 +387,7 @@
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
-                            <comboBox focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="yjq-mR-N9K">
+                            <comboBox verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="yjq-mR-N9K">
                                 <rect key="frame" x="138" y="50" width="244" height="23"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="240" id="qXK-4V-LIh"/>
@@ -442,7 +442,7 @@
                                     <rect key="frame" x="0.0" y="0.0" width="224" height="125"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
-                                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="fpO-Y8-ID9">
+                                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="fpO-Y8-ID9">
                                             <rect key="frame" x="-2" y="109" width="109" height="16"/>
                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Page Edge Insets" id="Lbl-rK-tS5">
                                                 <font key="font" metaFont="system"/>
@@ -450,7 +450,7 @@
                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
                                         </textField>
-                                        <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="GZW-FT-Ui5">
+                                        <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="GZW-FT-Ui5">
                                             <rect key="frame" x="55" y="78" width="60" height="21"/>
                                             <constraints>
                                                 <constraint firstAttribute="width" constant="60" id="vLP-x7-fUv"/>
@@ -461,7 +461,7 @@
                                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
                                         </textField>
-                                        <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="u5x-eb-WgQ">
+                                        <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="u5x-eb-WgQ">
                                             <rect key="frame" x="55" y="52" width="60" height="21"/>
                                             <constraints>
                                                 <constraint firstAttribute="width" constant="60" id="Fx3-z3-Fa4"/>
@@ -472,7 +472,7 @@
                                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
                                         </textField>
-                                        <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="y5Y-SZ-g00">
+                                        <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="y5Y-SZ-g00">
                                             <rect key="frame" x="55" y="26" width="60" height="21"/>
                                             <constraints>
                                                 <constraint firstAttribute="width" constant="60" id="fIX-iZ-FKR"/>
@@ -483,7 +483,7 @@
                                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
                                         </textField>
-                                        <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Aq6-za-ZbW">
+                                        <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Aq6-za-ZbW">
                                             <rect key="frame" x="55" y="0.0" width="60" height="21"/>
                                             <constraints>
                                                 <constraint firstAttribute="width" constant="60" id="kEY-5m-BH7"/>
@@ -534,7 +534,7 @@
                                                 <action selector="stepperItemClickDistance:" target="-2" id="UB9-gL-1OA"/>
                                             </connections>
                                         </stepper>
-                                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="YVT-s1-rav">
+                                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="YVT-s1-rav">
                                             <rect key="frame" x="105" y="109" width="30" height="13"/>
                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="(mm)" id="rCc-hn-XEe">
                                                 <font key="font" metaFont="system" size="10"/>
@@ -545,7 +545,7 @@
                                         <customView translatesAutoresizingMaskIntoConstraints="NO" id="tMv-o4-4OM">
                                             <rect key="frame" x="0.0" y="0.0" width="45" height="109"/>
                                             <subviews>
-                                                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="m3w-41-mFb">
+                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="m3w-41-mFb">
                                                     <rect key="frame" x="-2" y="54" width="49" height="16"/>
                                                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Bottom" id="AGJ-8B-Zbu">
                                                         <font key="font" metaFont="system"/>
@@ -553,7 +553,7 @@
                                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                     </textFieldCell>
                                                 </textField>
-                                                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="b0s-hq-qVW">
+                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="b0s-hq-qVW">
                                                     <rect key="frame" x="-2" y="2" width="49" height="16"/>
                                                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Right" id="myj-wu-Ft5">
                                                         <font key="font" metaFont="system"/>
@@ -561,7 +561,7 @@
                                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                     </textFieldCell>
                                                 </textField>
-                                                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1sX-Mg-uR4">
+                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1sX-Mg-uR4">
                                                     <rect key="frame" x="-2" y="80" width="49" height="16"/>
                                                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Top" id="XEW-xf-6g3">
                                                         <font key="font" metaFont="system"/>
@@ -569,7 +569,7 @@
                                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                     </textFieldCell>
                                                 </textField>
-                                                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="jl3-71-uGi">
+                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="jl3-71-uGi">
                                                     <rect key="frame" x="-2" y="28" width="49" height="16"/>
                                                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Left" id="uVy-X1-PON">
                                                         <font key="font" metaFont="system"/>
@@ -632,7 +632,7 @@
                                         <customView translatesAutoresizingMaskIntoConstraints="NO" id="65T-0M-DNJ">
                                             <rect key="frame" x="0.0" y="54" width="47" height="55"/>
                                             <subviews>
-                                                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Ywg-FK-JRs">
+                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Ywg-FK-JRs">
                                                     <rect key="frame" x="-2" y="26" width="51" height="16"/>
                                                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Line" id="4Nr-bk-Cmj">
                                                         <font key="font" metaFont="system"/>
@@ -640,7 +640,7 @@
                                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                                     </textFieldCell>
                                                 </textField>
-                                                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="J7N-Uj-gyt">
+                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="J7N-Uj-gyt">
                                                     <rect key="frame" x="-2" y="0.0" width="51" height="16"/>
                                                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Column" id="auB-Nh-Amw">
                                                         <font key="font" metaFont="system"/>
@@ -659,7 +659,7 @@
                                                 <constraint firstItem="J7N-Uj-gyt" firstAttribute="top" secondItem="Ywg-FK-JRs" secondAttribute="bottom" constant="10" id="jeS-dg-u3z"/>
                                             </constraints>
                                         </customView>
-                                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ghv-Cz-g1B">
+                                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ghv-Cz-g1B">
                                             <rect key="frame" x="-2" y="109" width="76" height="16"/>
                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Page Space" id="NDE-d6-rlT">
                                                 <font key="font" metaFont="system"/>
@@ -667,7 +667,7 @@
                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
                                         </textField>
-                                        <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Zqb-5h-u5I">
+                                        <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Zqb-5h-u5I">
                                             <rect key="frame" x="57" y="78" width="60" height="21"/>
                                             <constraints>
                                                 <constraint firstAttribute="width" constant="60" id="mcb-si-jzk"/>
@@ -678,7 +678,7 @@
                                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
                                         </textField>
-                                        <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="JTS-uh-aW9">
+                                        <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="JTS-uh-aW9">
                                             <rect key="frame" x="57" y="52" width="60" height="21"/>
                                             <constraints>
                                                 <constraint firstAttribute="width" constant="60" id="oKX-ep-J5F"/>
@@ -706,7 +706,7 @@
                                                 <action selector="stepperItemClickDistance:" target="-2" id="agB-UV-bXz"/>
                                             </connections>
                                         </stepper>
-                                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ALd-Hs-s9E">
+                                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ALd-Hs-s9E">
                                             <rect key="frame" x="72" y="109" width="30" height="13"/>
                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="(mm)" id="8Tr-uA-VJH">
                                                 <font key="font" metaFont="system" size="10"/>

+ 8 - 0
PDF Office/PDF Master/Class/PDFTools/Print/View/PrintSettingView/View/Pamphlet/KMPrintPamphletView.swift

@@ -43,6 +43,12 @@ class KMPrintPamphletView: KMBaseXibView, NSComboBoxDelegate {
     
     lazy var viewModel: KMPrintViewModel = KMPrintViewModel()
     
+    var printModel: KMPrintModel = KMPrintModel() {
+        didSet {
+            self.viewModel.model = printModel
+            self.reloadData()
+        }
+    }
     
     override func updateLanguage() {
         self.bookletUnitLabel.stringValue = NSLocalizedString("Unit:", comment: "")
@@ -59,6 +65,8 @@ class KMPrintPamphletView: KMBaseXibView, NSComboBoxDelegate {
     }
     
     override func setup() {
+        viewModel.model.page.operation.type = .pamphlet
+        
         self.bookletUnitComboBox.addItems(withObjectValues: KMPrintPaperInfoUnit.allValues())
         self.bookletUnitComboBox.isEditable = false
         self.bookletUnitComboBox.isSelectable = false

+ 7 - 0
PDF Office/PDF Master/Class/PDFTools/Print/View/PrintSettingView/View/Poster/KMPrintPosterView.swift

@@ -58,6 +58,13 @@ class KMPrintPosterView: KMBaseXibView {
     
     lazy var viewModel: KMPrintViewModel = KMPrintViewModel()
     
+    var printModel: KMPrintModel = KMPrintModel() {
+        didSet {
+            self.viewModel.model = printModel
+            self.reloadData()
+        }
+    }
+    
     override func setup() {
         viewModel.model.page.operation.type = .poster