Skip to content

Commit 48f539c

Browse files
committed
[feature] 更改一些默认配置;类名是否判重可选择
1 parent 3c64519 commit 48f539c

File tree

4 files changed

+14
-7
lines changed

4 files changed

+14
-7
lines changed

YBModelFile.podspec

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

55

66
s.name = "YBModelFile"
7-
s.version = "1.0.2"
7+
s.version = "1.0.3"
88
s.summary = "iOS 效率工具:自动生成 Model 文件(数据模型) / iOS efficiency tool : create data model files automatically"
99
s.description = <<-DESC
1010
iOS 效率工具:自动生成 Model 文件(数据模型) / iOS efficiency tool : create data model files automatically

YBModelFile/Handler/YBMFNameHandler.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ NS_ASSUME_NONNULL_BEGIN
3232
*/
3333
- (NSString *)ybmf_propertyNameWithKey:(id)key existKeys:(NSArray *)existKeys;
3434

35+
/* 是否需要类名判重(默认为 NO) */
36+
@property (nonatomic, assign) BOOL ybmf_shouldAvoidClassRepeat;
37+
3538
@end
3639

3740
/**

YBModelFile/Handler/YBMFNameHandler.m

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,8 @@ @implementation YBMFNameHandler
133133

134134
#pragma mark - <YBMFNameHandler>
135135

136+
@synthesize ybmf_shouldAvoidClassRepeat = _ybmf_shouldAvoidClassRepeat;
137+
136138
- (NSString *)ybmf_classNameWithPrefix:(NSString *)prefix suffix:(NSString *)suffix key:(id)key {
137139
NSString *keyStr = [NSString stringWithFormat:@"%@", key];
138140
if (!keyStr) keyStr = @"";
@@ -151,11 +153,13 @@ - (NSString *)ybmf_classNameWithPrefix:(NSString *)prefix suffix:(NSString *)suf
151153

152154
//类名判重
153155
NSString *tmp = [NSString stringWithFormat:@"%@%@%@", prefix, keyStr, suffix];
154-
NSUInteger suf = 0;
155-
while (NSClassFromString(tmp) && ![self.classNames containsObject:tmp]) {
156-
tmp = [NSString stringWithFormat:@"%@%@", prefix, keyStr];
157-
tmp = [tmp stringByAppendingString:[NSString stringWithFormat:@"%lu", (unsigned long)++suf]];
158-
tmp = [tmp stringByAppendingString:suffix];
156+
if (self.ybmf_shouldAvoidClassRepeat) {
157+
NSUInteger suf = 0;
158+
while (NSClassFromString(tmp) && ![self.classNames containsObject:tmp]) {
159+
tmp = [NSString stringWithFormat:@"%@%@", prefix, keyStr];
160+
tmp = [tmp stringByAppendingString:[NSString stringWithFormat:@"%lu", (unsigned long)++suf]];
161+
tmp = [tmp stringByAppendingString:suffix];
162+
}
159163
}
160164
[self.classNames addObject:tmp];
161165
return tmp;

YBModelFile/YBMFConfig.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ - (instancetype)initDefaults {
3939
if (self) {
4040
_fileSuffix = @"Model";
4141
_filePartitionMode = YBMFFilePartitionModeTogether;
42-
_ignoreType = YBMFIgnoreTypeMutable;
42+
_ignoreType = YBMFIgnoreTypeAllDigital | YBMFIgnoreTypeMutable;
4343
_baseClass = NSObject.self;
4444
_framework = YBMFFrameworkYY;
4545
_needCopying = YES;

0 commit comments

Comments
 (0)