Skip to content

Commit 867a52a

Browse files
committed
_addCommonValuesToRecorderIfNeed
1 parent ed41d23 commit 867a52a

4 files changed

Lines changed: 33 additions & 1 deletion

File tree

Demo/SJAttributesFactory/ViewController.m

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,31 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
246246
make.regexp(@"^[\\p{S}|\\p{P}|\\p{M}|\\p{Z}]+$", ^(SJAttributesRangeOperator * _Nonnull make) {
247247
make.textColor([UIColor redColor]);
248248
});
249+
250+
[self updateConstraintsWithSize:make.sizeByWidth(self.view.bounds.size.width - 80)];
251+
});
252+
}
253+
break;
254+
255+
case 9: {
256+
257+
tips = @"测试";
258+
259+
attr = sj_makeAttributesString(^(SJAttributeWorker * _Nonnull make) {
260+
261+
make.font([UIFont boldSystemFontOfSize:30]);
262+
263+
make.append(@"lalalalalalalsho sj");
264+
265+
make.regexp(@"sj", ^(SJAttributesRangeOperator * _Nonnull make) {
266+
make.textColor([UIColor blueColor]);
267+
});
268+
269+
make.regexp(@"^((?!shop[\\s]*).)*sj", ^(SJAttributesRangeOperator * _Nonnull make) {
270+
make.textColor([UIColor redColor]);
271+
});
272+
273+
[self updateConstraintsWithSize:make.sizeByWidth(self.view.bounds.size.width - 80)];
249274
});
250275
}
251276
break;

SJAttributesFactory.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Pod::Spec.new do |s|
1616
#
1717

1818
s.name = "SJAttributesFactory"
19-
s.version = "2.0.3.3"
19+
s.version = "2.0.3.4"
2020
s.summary = "富文本编辑工厂."
2121

2222
# This description is used to generate tags and improve search results.

SJAttributesFactory/SJAttributeWorker.m

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,18 @@ - (NSMutableAttributedString *)endTask {
8989
if ( nil == self.recorder.textColor ) self.recorder.textColor = self.defaultTextColor;
9090
_addAttributes(self, self.attrStr);
9191
[self.rangeOperatorsM enumerateObjectsUsingBlock:^(SJAttributesRangeOperator * _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
92+
[self _addCommonValuesToRecorderIfNeed:obj.recorder];
9293
_addAttributes(obj, self.attrStr);
9394
}];
9495
return self.attrStr;
9596
}
9697

98+
- (void)_addCommonValuesToRecorderIfNeed:(SJAttributesRecorder *)recorder {
99+
if ( nil == recorder.font ) recorder.font = self.recorder.font;
100+
if ( 0 == recorder.lineSpacing ) recorder.lineSpacing = self.recorder.lineSpacing;
101+
//if ( nil == recorder.textColor ) recorder.textColor = self.recorder.textColor;
102+
}
103+
97104
BOOL _addAttributes(SJAttributesRangeOperator *operator, NSMutableAttributedString *attrStr) {
98105
if ( operator.recorder_value_added ) return NO;
99106
[operator.recorder addAttributes:attrStr];

0 commit comments

Comments
 (0)