Skip to content

Commit 2d466d9

Browse files
committed
Merge commit 'c8d4bdbb6570ab3670c0f47715e3ada97f1437eb'
2 parents ab4acdf + c8d4bdb commit 2d466d9

12 files changed

Lines changed: 21 additions & 296 deletions

File tree

QMUI/QMUI class.xctemplate/QMUICommonTableViewController/___FILEBASENAME___.h

Lines changed: 0 additions & 13 deletions
This file was deleted.

QMUI/QMUI class.xctemplate/QMUICommonTableViewController/___FILEBASENAME___.m

Lines changed: 0 additions & 97 deletions
This file was deleted.

QMUI/QMUI class.xctemplate/QMUICommonViewController/___FILEBASENAME___.h

Lines changed: 0 additions & 13 deletions
This file was deleted.

QMUI/QMUI class.xctemplate/QMUICommonViewController/___FILEBASENAME___.m

Lines changed: 0 additions & 72 deletions
This file was deleted.

QMUI/QMUI class.xctemplate/Readme.txt

Lines changed: 0 additions & 7 deletions
This file was deleted.
-42.7 KB
Binary file not shown.

QMUI/QMUI class.xctemplate/TemplateInfo.plist

Lines changed: 0 additions & 70 deletions
This file was deleted.

QMUI/QMUIConfigurationTemplate/QMUIConfigurationTemplate.m

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77
//
88

99
#import "QMUIConfigurationTemplate.h"
10-
11-
// 如果这里找不到QMUIKit.h,请尝试替换为 #import <QMUIKit/QMUIKit.h>
12-
#import "QMUIKit.h"
10+
#import <QMUIKit/QMUIKit.h>
1311

1412
@implementation QMUIConfigurationTemplate
1513

QMUI/QMUIKit/UIKitExtensions/QMUITextView.m

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,22 @@ - (void)setAttributedText:(NSAttributedString *)attributedText {
158158

159159
- (void)setTypingAttributes:(NSDictionary<NSString *,id> *)typingAttributes {
160160
[super setTypingAttributes:typingAttributes];
161-
self.placeholder = self.placeholder;// 更新文字样式
161+
[self updatePlaceholderStyle];
162+
}
163+
164+
- (void)setFont:(UIFont *)font {
165+
[super setFont:font];
166+
[self updatePlaceholderStyle];
167+
}
168+
169+
- (void)setTextColor:(UIColor *)textColor {
170+
[super setTextColor:textColor];
171+
[self updatePlaceholderStyle];
172+
}
173+
174+
- (void)setTextAlignment:(NSTextAlignment)textAlignment {
175+
[super setTextAlignment:textAlignment];
176+
[self updatePlaceholderStyle];
162177
}
163178

164179
- (void)setPlaceholder:(NSString *)placeholder {
@@ -175,6 +190,10 @@ - (void)setPlaceholderColor:(UIColor *)placeholderColor {
175190
self.placeholderLabel.textColor = _placeholderColor;
176191
}
177192

193+
- (void)updatePlaceholderStyle {
194+
self.placeholder = self.placeholder;// 触发文字样式的更新
195+
}
196+
178197
- (void)handleTextChanged:(id)sender {
179198
// 输入字符的时候,placeholder隐藏
180199
if(self.placeholder.length > 0) {

QMUI/QMUIKit/UIResources/readme.txt

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)