_addCommonValuesToRecorderIfNeed

changsanjiang · Sep 11, 2018 · 867a52a · 867a52a
1 parent ed41d23
commit 867a52a
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 1 deletion.
diff --git a/...butesFactory.xcworkspace/xcuserdata/bluedancer.xcuserdatad/UserInterfaceState.xcuserstate b/...butesFactory.xcworkspace/xcuserdata/bluedancer.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Demo/SJAttributesFactory/ViewController.m b/Demo/SJAttributesFactory/ViewController.m
@@ -246,6 +246,31 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
                 make.regexp(@"^[\\p{S}|\\p{P}|\\p{M}|\\p{Z}]+$", ^(SJAttributesRangeOperator * _Nonnull make) {
                     make.textColor([UIColor redColor]);
                 });
+
+                [self updateConstraintsWithSize:make.sizeByWidth(self.view.bounds.size.width - 80)];
+            });
+        }
+            break;
+
+        case 9: {
+
+            tips = @"测试";
+
+            attr = sj_makeAttributesString(^(SJAttributeWorker * _Nonnull make) {
+
+                make.font([UIFont boldSystemFontOfSize:30]);
+
+                make.append(@"lalalalalalalsho sj");
+
+                make.regexp(@"sj", ^(SJAttributesRangeOperator * _Nonnull make) {
+                    make.textColor([UIColor blueColor]);
+                });
+
+                make.regexp(@"^((?!shop[\\s]*).)*sj", ^(SJAttributesRangeOperator * _Nonnull make) {
+                    make.textColor([UIColor redColor]);
+                });
+
+                [self updateConstraintsWithSize:make.sizeByWidth(self.view.bounds.size.width - 80)];
             });
         }
             break;

diff --git a/SJAttributesFactory.podspec b/SJAttributesFactory.podspec
@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
   #
 
   s.name         = "SJAttributesFactory"
-  s.version      = "2.0.3.3"
+  s.version      = "2.0.3.4"
   s.summary      = "富文本编辑工厂."
 
   # This description is used to generate tags and improve search results.

diff --git a/SJAttributesFactory/SJAttributeWorker.m b/SJAttributesFactory/SJAttributeWorker.m
@@ -89,11 +89,18 @@ - (NSMutableAttributedString *)endTask {
     if ( nil == self.recorder.textColor ) self.recorder.textColor = self.defaultTextColor;
     _addAttributes(self, self.attrStr);
     [self.rangeOperatorsM enumerateObjectsUsingBlock:^(SJAttributesRangeOperator * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
+        [self _addCommonValuesToRecorderIfNeed:obj.recorder];
         _addAttributes(obj, self.attrStr);
     }];
     return self.attrStr;
 }
 
+- (void)_addCommonValuesToRecorderIfNeed:(SJAttributesRecorder *)recorder {
+    if ( nil == recorder.font ) recorder.font = self.recorder.font;
+    if ( 0 == recorder.lineSpacing ) recorder.lineSpacing = self.recorder.lineSpacing;
+    //if ( nil == recorder.textColor ) recorder.textColor = self.recorder.textColor;
+}
+
 BOOL _addAttributes(SJAttributesRangeOperator *operator, NSMutableAttributedString *attrStr) {
     if ( operator.recorder_value_added ) return NO;
     [operator.recorder addAttributes:attrStr];