.

lixiang1994 · Aug 12, 2020 · 81796c2 · 81796c2
1 parent 23608f7
commit 81796c2
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/Demo/Demo/Debug/Debug.storyboard b/Demo/Demo/Debug/Debug.storyboard
@@ -251,8 +251,8 @@
                                                                                                         <nil key="textColor"/>
                                                                                                         <nil key="highlightedColor"/>
                                                                                                     </label>
-                                                                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="PingFang" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cft-PD-lmZ">
-                                                                                                        <rect key="frame" x="96.333333333333329" y="6" width="63.666666666666671" height="18"/>
+                                                                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=".SFUI-Regular" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cft-PD-lmZ">
+                                                                                                        <rect key="frame" x="96.333333333333314" y="6" width="95.666666666666686" height="18"/>
                                                                                                         <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                                                                                         <color key="textColor" systemColor="placeholderTextColor" red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.29999999999999999" colorSpace="custom" customColorSpace="sRGB"/>
                                                                                                         <nil key="highlightedColor"/>

diff --git a/Demo/Demo/Debug/DebugLabelView.swift b/Demo/Demo/Debug/DebugLabelView.swift
@@ -232,6 +232,7 @@ extension DebugLabelView {
     func set(text: AttributedString) {
         // 富文本中如果包含段落样式 则无法进行多行字号缩放
         label.attributed.text = text
+        // 刷新布局
         layoutIfNeeded()
     }
 

diff --git a/Demo/Demo/Debug/DebugLabelViewController.swift b/Demo/Demo/Debug/DebugLabelViewController.swift
@@ -36,7 +36,7 @@ class DebugLabelViewController: ViewController<DebugLabelView> {
     private var attributes: [AttributedString.Attribute] = []
     private var paragraphs: [AttributedString.Attribute.ParagraphStyle] = []
     private var attributedString: AttributedString = """
-        我的名字叫李响，我的手机号码是18611401994，我的电子邮件地址是[email protected]，现在是2020/06/28 20:30。我的GitHub主页是https://github.com/lixiang1994。欢迎来Star! \("点击联系我", .action({ }))
+    我的名字叫李响，我的手机号码是18611401994，我的电子邮件地址是[email protected]，现在是2020/06/28 20:30。我的GitHub主页是https://github.com/lixiang1994。欢迎来Star! \("点击联系我", .action({ }))
     """
 
     override func viewDidLoad() {

diff --git a/Sources/Extension/UIKit/UILabel/UILabelExtension.swift b/Sources/Extension/UIKit/UILabel/UILabelExtension.swift
@@ -450,7 +450,7 @@ extension UILabel {
         ) { (value, range, stop) in
             guard let old = value as? NSParagraphStyle else { return }
             guard let new = old.mutableCopy() as? NSMutableParagraphStyle else { return }
-            new.lineBreakMode = numberOfLines == 1 ? .byCharWrapping : .byWordWrapping
+            new.lineBreakMode = .byWordWrapping
             if #available(iOS 11.0, *) {
                 new.setValue(1, forKey: "lineBreakStrategy")
             }