Browse Source

Home - 修复窗口范围变化时,约束计算是错误

wanjun 1 year ago
parent
commit
ed4102f08d

+ 2 - 3
PDF Office/PDF Master/Class/Home/ViewController/KMAIOpenPDFFilesVC.xib

@@ -43,7 +43,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ymv-tl-S9B">
-                                <rect key="frame" x="-2" y="280" width="798" height="28"/>
+                                <rect key="frame" x="-2" y="292" width="798" height="16"/>
                                 <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="OvS-AE-U4f">
                                     <font key="font" usesAppearanceFont="YES"/>
                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -188,12 +188,12 @@
                             <constraint firstAttribute="trailing" secondItem="Lt3-8t-GUS" secondAttribute="trailing" id="Bs6-9V-Bva"/>
                             <constraint firstItem="Lt3-8t-GUS" firstAttribute="top" secondItem="ijL-7x-C3M" secondAttribute="bottom" constant="12" id="CZV-j3-Dd3"/>
                             <constraint firstItem="sWW-D6-Ohy" firstAttribute="top" secondItem="Lt3-8t-GUS" secondAttribute="bottom" constant="12" id="HAu-Rr-Jh6"/>
-                            <constraint firstItem="ijL-7x-C3M" firstAttribute="top" secondItem="ymv-tl-S9B" secondAttribute="bottom" constant="16" id="HG9-FX-xMS"/>
                             <constraint firstItem="ijL-7x-C3M" firstAttribute="leading" secondItem="ITd-Xp-Gda" secondAttribute="leading" id="KZm-39-nw1"/>
                             <constraint firstItem="sWW-D6-Ohy" firstAttribute="leading" secondItem="ITd-Xp-Gda" secondAttribute="leading" id="POY-aw-77z"/>
                             <constraint firstAttribute="bottom" secondItem="sWW-D6-Ohy" secondAttribute="bottom" id="PcU-Ej-014"/>
                             <constraint firstAttribute="trailing" secondItem="ymv-tl-S9B" secondAttribute="trailing" id="T7c-KN-RfV"/>
                             <constraint firstItem="ymv-tl-S9B" firstAttribute="top" secondItem="ITd-Xp-Gda" secondAttribute="top" id="hoW-km-0Fa"/>
+                            <constraint firstItem="ijL-7x-C3M" firstAttribute="top" secondItem="ITd-Xp-Gda" secondAttribute="top" constant="44" id="ncV-fM-UnB"/>
                         </constraints>
                     </view>
                     <constraints>
@@ -329,7 +329,6 @@
                 <constraint firstItem="0Nz-PR-SKo" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="32" id="1yT-Xh-eRe"/>
                 <constraint firstItem="rkU-6X-4PB" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="32" id="De8-if-bLF"/>
                 <constraint firstAttribute="trailing" secondItem="rkU-6X-4PB" secondAttribute="trailing" constant="32" id="IdV-ca-59L"/>
-                <constraint firstAttribute="bottom" secondItem="rkU-6X-4PB" secondAttribute="bottom" constant="40" id="JAT-NW-dZI"/>
                 <constraint firstItem="0Nz-PR-SKo" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" constant="40" id="Kix-7G-Xhq"/>
                 <constraint firstAttribute="trailing" secondItem="0Nz-PR-SKo" secondAttribute="trailing" constant="32" id="NN5-z5-Oan"/>
                 <constraint firstItem="rkU-6X-4PB" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" constant="40" id="XF4-iR-ChB"/>

+ 8 - 8
PDF Office/PDF Master/Class/Home/ViewController/KMHomeFastToolViewController.xib

@@ -6,7 +6,7 @@
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="KMHomeFastToolViewController" customModule="PDF_Office" customModuleProvider="target">
+        <customObject id="-2" userLabel="File's Owner" customClass="KMHomeFastToolViewController" customModule="PDF_Master" customModuleProvider="target">
             <connections>
                 <outlet property="fastToolAllToolsBox" destination="PmI-UH-OJw" id="nCH-Dn-FVX"/>
                 <outlet property="fastToolAllToolsBoxHeight" destination="Weh-t7-Z7D" id="aum-O6-pb8"/>
@@ -50,7 +50,7 @@
                         <constraint firstAttribute="height" constant="28" id="hBw-CS-vYS"/>
                     </constraints>
                 </box>
-                <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="Mlh-9T-Aco" customClass="KMBox" customModule="PDF_Office" customModuleProvider="target">
+                <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="Mlh-9T-Aco" customClass="KMBox" customModule="PDF_Master" customModuleProvider="target">
                     <rect key="frame" x="662" y="344" width="32" height="32"/>
                     <view key="contentView" id="GdR-TJ-8eI">
                         <rect key="frame" x="0.0" y="0.0" width="32" height="32"/>
@@ -62,7 +62,7 @@
                     </constraints>
                     <color key="fillColor" name="systemRedColor" catalog="System" colorSpace="catalog"/>
                 </box>
-                <box hidden="YES" boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="PmI-UH-OJw" customClass="KMBox" customModule="PDF_Office" customModuleProvider="target">
+                <box hidden="YES" boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="PmI-UH-OJw" customClass="KMBox" customModule="PDF_Master" customModuleProvider="target">
                     <rect key="frame" x="579" y="344" width="67" height="32"/>
                     <view key="contentView" id="hDk-Nj-feL">
                         <rect key="frame" x="0.0" y="0.0" width="67" height="32"/>
@@ -84,11 +84,11 @@
                             <scrollView wantsLayer="YES" borderType="none" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasVerticalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uso-UI-yCw">
                                 <rect key="frame" x="0.0" y="0.0" width="662" height="328"/>
                                 <clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="5Kk-ea-dV6">
-                                    <rect key="frame" x="0.0" y="0.0" width="662" height="313"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="662" height="328"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
-                                        <collectionView selectable="YES" id="uRS-jl-d4p" customClass="KMFastToolCollectionView" customModule="PDF_Office" customModuleProvider="target">
-                                            <rect key="frame" x="0.0" y="0.0" width="662" height="313"/>
+                                        <collectionView selectable="YES" id="uRS-jl-d4p" customClass="KMFastToolCollectionView" customModule="PDF_Master" customModuleProvider="target">
+                                            <rect key="frame" x="0.0" y="0.0" width="662" height="328"/>
                                             <autoresizingMask key="autoresizingMask" heightSizable="YES"/>
                                             <collectionViewFlowLayout key="collectionViewLayout" minimumInteritemSpacing="10" minimumLineSpacing="10" scrollDirection="horizontal" id="ISw-7m-91E">
                                                 <size key="itemSize" width="50" height="50"/>
@@ -102,8 +102,8 @@
                                     </subviews>
                                     <color key="backgroundColor" red="1" green="0.99843658091226151" blue="0.99619259258638859" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                 </clipView>
-                                <scroller key="horizontalScroller" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="sRD-Yg-vn1" customClass="KMToolSetScroller" customModule="PDF_Office" customModuleProvider="target">
-                                    <rect key="frame" x="0.0" y="313" width="662" height="15"/>
+                                <scroller key="horizontalScroller" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="sRD-Yg-vn1" customClass="KMToolSetScroller" customModule="PDF_Master" customModuleProvider="target">
+                                    <rect key="frame" x="0.0" y="312" width="662" height="16"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                 </scroller>
                                 <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="lpk-Q5-DdG">

+ 5 - 4
PDF Office/PDF Master/Class/Home/ViewController/KMHomeViewController+UI.swift

@@ -243,10 +243,10 @@ extension KMHomeViewController {
         
         if self.aiOpenPDFFilesViewController != nil {
             if rightWidth >= (360 + 20 + 328) {
-                self.rightTopBoxHeightConstraint.constant = 348 + 40
+                self.rightTopBoxHeightConstraint.constant = 348
                 self.aiOpenPDFFilesViewController.refreshLayout(isLimit: false)
             } else {
-                self.rightTopBoxHeightConstraint.constant = (348 + 40) * 2
+                self.rightTopBoxHeightConstraint.constant = 348 * 2
                 self.aiOpenPDFFilesViewController.refreshLayout(isLimit: true)
             }
 //            let scrollView: NSScrollView = self.homeRightScrollViewView
@@ -278,13 +278,13 @@ extension KMHomeViewController {
                         row += 1
                     }
                     let height2 = (248 + 16) * row
-                    contentViewHeight = Int(self.rightTopBox.frame.height + CGFloat(height2) + 76 + self.noneView.frame.height)
+                    contentViewHeight = Int(self.rightTopBoxHeightConstraint.constant + CGFloat(height2) + 76)
                     self.rightBottonHeight.constant = CGFloat(height2) + 76
                 }
             } else {
                 if self.historyFileViewController.listScrollView != nil {
                     let height2 = self.historyFileViewController.files.count * 72 + 32
-                    contentViewHeight = Int(self.rightTopBox.frame.height + CGFloat(height2) + 76 + self.noneView.frame.height)
+                    contentViewHeight = Int(self.rightTopBoxHeightConstraint.constant + CGFloat(height2) + 76)
                     self.rightBottonHeight.constant = CGFloat(height2) + 76
                 }
             }
@@ -294,6 +294,7 @@ extension KMHomeViewController {
         }
         if contentViewHeight < Int(rect.height) {
             contentViewHeight = Int(rect.height)
+            self.rightBottonHeight.constant = rect.height - self.rightTopBoxHeightConstraint.constant
         }
         
         self.homeRightScrollViewView.documentView!.frame = NSRect(x: 271, y: 0, width: rightWidth, height: contentViewHeight)

+ 0 - 2
PDF Office/PDF Master/Class/Home/ViewController/KMHomeViewController.swift

@@ -124,7 +124,6 @@ import KMAdvertisement
     var timerCounter = 0.0
     
     @IBOutlet weak var rightBottonHeight: NSLayoutConstraint!
-    @IBOutlet weak var noneView: NSView!
     
     override func viewWillAppear() {
         super.viewWillAppear()
@@ -364,7 +363,6 @@ import KMAdvertisement
         rightTopBox.fillColor = .white
         rightBottomBox.fillColor = .white
         rightFullBox.fillColor = .white
-        self.noneView.backgroundColor(.white)
 
         self.aiHomeBox.fillColor = .clear
         self.aiHomeBox.cornerRadius = 8.0

+ 20 - 27
PDF Office/PDF Master/Class/Home/ViewController/KMHomeViewController.xib

@@ -42,7 +42,6 @@
                 <outlet property="homeRightScrollViewView" destination="Fsd-Oz-v7c" id="AOG-NU-G8N"/>
                 <outlet property="homeSplitView" destination="yVp-SB-ljO" id="zSV-aW-5He"/>
                 <outlet property="leftBox" destination="ndG-c5-lCg" id="Gx0-kb-H6N"/>
-                <outlet property="noneView" destination="MRe-JP-3Hc" id="bWY-7Y-ysh"/>
                 <outlet property="openPDFBox" destination="IBc-Xn-ACX" id="rfa-yX-fM2"/>
                 <outlet property="openPDFBoxHeight" destination="mSn-iS-alV" id="UaX-Ju-Duw"/>
                 <outlet property="othersBox" destination="dvb-4g-gRa" id="Gm3-he-MwX"/>
@@ -61,7 +60,7 @@
                 <outlet property="product_active_scrollView" destination="Zv8-o9-nPx" id="zS7-N2-btc"/>
                 <outlet property="product_active_spacing" destination="Oxs-0g-w3P" id="VMf-lR-Qvd"/>
                 <outlet property="rightBottomBox" destination="UYd-oU-m2C" id="XYW-TM-vpq"/>
-                <outlet property="rightBottonHeight" destination="8mk-3b-brc" id="89T-Fn-FFM"/>
+                <outlet property="rightBottonHeight" destination="Rdc-5S-WLs" id="hLv-Q8-gGe"/>
                 <outlet property="rightBox" destination="47d-27-CfS" id="m44-Ey-vUw"/>
                 <outlet property="rightFullBox" destination="VIr-YS-5o0" id="0cK-du-qOJ"/>
                 <outlet property="rightTopBox" destination="riD-ya-jJ5" id="xFv-Cd-vsI"/>
@@ -210,22 +209,22 @@ Gw
                                                 <scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Zv8-o9-nPx">
                                                     <rect key="frame" x="0.0" y="0.0" width="270" height="652"/>
                                                     <clipView key="contentView" drawsBackground="NO" id="0m5-Ti-Llk">
-                                                        <rect key="frame" x="0.0" y="0.0" width="255" height="652"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="270" height="652"/>
                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                         <subviews>
                                                             <view translatesAutoresizingMaskIntoConstraints="NO" id="TNl-3V-JVe">
-                                                                <rect key="frame" x="0.0" y="-9" width="255" height="661"/>
+                                                                <rect key="frame" x="0.0" y="-9" width="270" height="661"/>
                                                                 <subviews>
                                                                     <box boxType="custom" borderWidth="0.0" cornerRadius="8" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="iRu-hZ-Eba" customClass="KMBox" customModule="PDF_Master" customModuleProvider="target">
-                                                                        <rect key="frame" x="16" y="549" width="238" height="112"/>
+                                                                        <rect key="frame" x="16" y="549" width="253" height="112"/>
                                                                         <view key="contentView" id="Szn-qw-Fab">
-                                                                            <rect key="frame" x="0.0" y="0.0" width="238" height="112"/>
+                                                                            <rect key="frame" x="0.0" y="0.0" width="253" height="112"/>
                                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                                             <subviews>
                                                                                 <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="3fs-f7-jLw">
-                                                                                    <rect key="frame" x="0.0" y="80" width="238" height="32"/>
+                                                                                    <rect key="frame" x="0.0" y="80" width="253" height="32"/>
                                                                                     <view key="contentView" id="Pht-vQ-L6e">
-                                                                                        <rect key="frame" x="0.0" y="0.0" width="238" height="32"/>
+                                                                                        <rect key="frame" x="0.0" y="0.0" width="253" height="32"/>
                                                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                                                     </view>
                                                                                     <constraints>
@@ -234,9 +233,9 @@ Gw
                                                                                     <color key="fillColor" name="systemRedColor" catalog="System" colorSpace="catalog"/>
                                                                                 </box>
                                                                                 <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="MnV-Ga-AMN">
-                                                                                    <rect key="frame" x="0.0" y="60" width="238" height="20"/>
+                                                                                    <rect key="frame" x="0.0" y="60" width="253" height="20"/>
                                                                                     <view key="contentView" id="kBq-4H-y0e">
-                                                                                        <rect key="frame" x="0.0" y="0.0" width="238" height="20"/>
+                                                                                        <rect key="frame" x="0.0" y="0.0" width="253" height="20"/>
                                                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                                                     </view>
                                                                                     <constraints>
@@ -244,9 +243,9 @@ Gw
                                                                                     </constraints>
                                                                                 </box>
                                                                                 <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="c99-Fc-Xms">
-                                                                                    <rect key="frame" x="0.0" y="20" width="238" height="32"/>
+                                                                                    <rect key="frame" x="0.0" y="20" width="253" height="32"/>
                                                                                     <view key="contentView" id="66O-AN-y7M">
-                                                                                        <rect key="frame" x="0.0" y="0.0" width="238" height="32"/>
+                                                                                        <rect key="frame" x="0.0" y="0.0" width="253" height="32"/>
                                                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                                                     </view>
                                                                                     <constraints>
@@ -255,9 +254,9 @@ Gw
                                                                                     <color key="fillColor" name="systemRedColor" catalog="System" colorSpace="catalog"/>
                                                                                 </box>
                                                                                 <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="dvb-4g-gRa">
-                                                                                    <rect key="frame" x="0.0" y="0.0" width="238" height="20"/>
+                                                                                    <rect key="frame" x="0.0" y="0.0" width="253" height="20"/>
                                                                                     <view key="contentView" id="Sv3-Bf-g3Z">
-                                                                                        <rect key="frame" x="0.0" y="0.0" width="238" height="20"/>
+                                                                                        <rect key="frame" x="0.0" y="0.0" width="253" height="20"/>
                                                                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                                                     </view>
                                                                                     <constraints>
@@ -284,9 +283,9 @@ Gw
                                                                         <color key="fillColor" red="0.92156862745098034" green="0.92156862745098034" blue="0.92156862745098034" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                                     </box>
                                                                     <box boxType="custom" borderWidth="0.0" cornerRadius="8" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="MFa-T5-0wb" customClass="KMBox" customModule="PDF_Master" customModuleProvider="target">
-                                                                        <rect key="frame" x="32" y="30" width="206" height="242"/>
+                                                                        <rect key="frame" x="32" y="30" width="221" height="242"/>
                                                                         <view key="contentView" id="zIt-55-NjD">
-                                                                            <rect key="frame" x="0.0" y="0.0" width="206" height="242"/>
+                                                                            <rect key="frame" x="0.0" y="0.0" width="221" height="242"/>
                                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                                         </view>
                                                                         <constraints>
@@ -317,7 +316,7 @@ Gw
                                                         <autoresizingMask key="autoresizingMask"/>
                                                     </scroller>
                                                     <scroller key="verticalScroller" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="eMA-3D-xnv" customClass="KMToolSetScroller" customModule="PDF_Master" customModuleProvider="target">
-                                                        <rect key="frame" x="255" y="0.0" width="15" height="652"/>
+                                                        <rect key="frame" x="254" y="0.0" width="16" height="652"/>
                                                         <autoresizingMask key="autoresizingMask"/>
                                                     </scroller>
                                                 </scrollView>
@@ -552,18 +551,15 @@ Gw
                                                             </constraints>
                                                         </box>
                                                         <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="UYd-oU-m2C">
-                                                            <rect key="frame" x="0.0" y="119" width="803" height="500"/>
+                                                            <rect key="frame" x="0.0" y="0.0" width="803" height="619"/>
                                                             <view key="contentView" id="Ktd-K9-9Kt">
-                                                                <rect key="frame" x="0.0" y="0.0" width="803" height="500"/>
+                                                                <rect key="frame" x="0.0" y="0.0" width="803" height="619"/>
                                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                             </view>
                                                             <constraints>
-                                                                <constraint firstAttribute="height" constant="500" id="8mk-3b-brc"/>
+                                                                <constraint firstAttribute="height" constant="619" id="Rdc-5S-WLs"/>
                                                             </constraints>
                                                         </box>
-                                                        <customView translatesAutoresizingMaskIntoConstraints="NO" id="MRe-JP-3Hc">
-                                                            <rect key="frame" x="0.0" y="0.0" width="803" height="119"/>
-                                                        </customView>
                                                         <box boxType="custom" borderWidth="0.0" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="VIr-YS-5o0">
                                                             <rect key="frame" x="0.0" y="0.0" width="803" height="819"/>
                                                             <view key="contentView" id="meL-Tj-h1p">
@@ -573,16 +569,13 @@ Gw
                                                         </box>
                                                     </subviews>
                                                     <constraints>
-                                                        <constraint firstItem="MRe-JP-3Hc" firstAttribute="top" secondItem="UYd-oU-m2C" secondAttribute="bottom" id="2fF-Qa-Ye6"/>
                                                         <constraint firstItem="UYd-oU-m2C" firstAttribute="leading" secondItem="nNN-UX-CRH" secondAttribute="leading" id="CoL-ok-bpJ"/>
-                                                        <constraint firstAttribute="trailing" secondItem="MRe-JP-3Hc" secondAttribute="trailing" id="L9d-K2-E7J"/>
                                                         <constraint firstAttribute="trailing" secondItem="riD-ya-jJ5" secondAttribute="trailing" id="SGj-C4-28a"/>
+                                                        <constraint firstAttribute="bottom" secondItem="UYd-oU-m2C" secondAttribute="bottom" id="aCV-O1-y15"/>
                                                         <constraint firstItem="riD-ya-jJ5" firstAttribute="leading" secondItem="nNN-UX-CRH" secondAttribute="leading" id="cEs-JL-ChJ"/>
                                                         <constraint firstItem="riD-ya-jJ5" firstAttribute="top" secondItem="nNN-UX-CRH" secondAttribute="top" id="dbJ-hz-GUi"/>
-                                                        <constraint firstAttribute="bottom" secondItem="MRe-JP-3Hc" secondAttribute="bottom" id="dqR-9q-zn2"/>
                                                         <constraint firstItem="VIr-YS-5o0" firstAttribute="top" secondItem="nNN-UX-CRH" secondAttribute="top" id="kP5-ds-LS1"/>
                                                         <constraint firstAttribute="trailing" secondItem="VIr-YS-5o0" secondAttribute="trailing" id="lRx-gI-z4m"/>
-                                                        <constraint firstItem="MRe-JP-3Hc" firstAttribute="leading" secondItem="nNN-UX-CRH" secondAttribute="leading" id="leb-Yb-ZQN"/>
                                                         <constraint firstAttribute="trailing" secondItem="UYd-oU-m2C" secondAttribute="trailing" id="len-PZ-9bi"/>
                                                         <constraint firstAttribute="bottom" secondItem="VIr-YS-5o0" secondAttribute="bottom" id="tJo-s6-Bni"/>
                                                         <constraint firstItem="VIr-YS-5o0" firstAttribute="leading" secondItem="nNN-UX-CRH" secondAttribute="leading" id="vJs-6s-heY"/>

+ 1 - 0
PDF Office/PDF Master/Class/PDFWindowController/ViewController/KMMainViewController.swift

@@ -1190,6 +1190,7 @@ import Cocoa
             if event.keyCode == 53 {
                 if self?.listView.toolMode == .editPDFToolMode {
                     if self != nil {
+                        //使用editingSelectionString获取内容文字
                         if self!.listView.editingAreas() != nil {
                             if self!.listView.editingAreas().count > 0 && self!.listView.isEditable() {
                                 self!.listView.clearEditingSelectCharItem()