支持多维数组转化，数组字段多维混合结构待支持，准备增加新的配置类方法加以实现

ibireme · Jan 22, 2018 · 6067e57 · 6067e57
1 parent 1230e60
commit 6067e57
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/YYModel/NSObject+YYModel.m b/YYModel/NSObject+YYModel.m
@@ -911,6 +911,9 @@ static void ModelSetValueForProperty(__unsafe_unretained id model,
                                     NSObject *newOne = [cls new];
                                     [newOne yy_modelSetWithDictionary:one];
                                     if (newOne) [objectArr addObject:newOne];
+                                } else if ([one isKindOfClass:[NSArray class]]) {
+                                    NSArray *objectArrInner = [NSArray yy_modelArrayWithClass:meta->_genericCls json:one];
+                                    [objectArr addObject:objectArrInner];
                                 }
                             }
                             ((void (*)(id, SEL, id))(void *) objc_msgSend)((id)model, meta->_setter, objectArr);
@@ -1795,9 +1798,13 @@ + (NSArray *)yy_modelArrayWithClass:(Class)cls array:(NSArray *)arr {
     if (!cls || !arr) return nil;
     NSMutableArray *result = [NSMutableArray new];
     for (NSDictionary *dic in arr) {
-        if (![dic isKindOfClass:[NSDictionary class]]) continue;
-        NSObject *obj = [cls yy_modelWithDictionary:dic];
-        if (obj) [result addObject:obj];
+        if ([dic isKindOfClass:[NSDictionary class]]) {
+            NSObject *obj = [cls yy_modelWithDictionary:dic];
+            if (obj) [result addObject:obj];
+        } else if ([dic isKindOfClass:[NSArray class]]) {
+            NSArray *objectArrInner = [NSArray yy_modelArrayWithClass:cls json:dic];
+            [result addObject:objectArrInner];
+        }
     }
     return result;
 }