优化输出格式

ModelTypes/ComplexModelType.cs

@@ -31,13 +31,15 @@ namespace FlutterCodeGenerator.ModelTypes
                 }
                 else if (child is DateTimeModelType)
                 {
-                    source.AppendLine($"\t\tif({child.Name_Lower} != null)");
+                    source.AppendLine($"\t\tif({child.Name_Lower} != null) {{");
                     source.AppendLine($"\t\t\tmap['{child.Name_Upper}'] = JsonRpcUtils.dateFormat({child.Name_Lower}!);");
+                    source.AppendLine($"\t\t}}");
                 }
                 else
                 {
-                    source.AppendLine($"\t\tif({child.Name_Lower} != null)");
+                    source.AppendLine($"\t\tif({child.Name_Lower} != null) {{");
                     source.AppendLine($"\t\t\tmap['{child.Name_Upper}'] = {child.Name_Lower};");
+                    source.AppendLine($"\t\t}}");
                 }
             }
             source.AppendLine("\t\treturn map;");
@@ -160,7 +162,7 @@ namespace FlutterCodeGenerator.ModelTypes
                         else if (listModelType.GenericArgumentModelType is SimpleModelType && !(listModelType.GenericArgumentModelType is ExtraObjectModelType))
                         {
                             var model = listModelType.GenericArgumentModelType.GetFlutterTypeName();
-                            source.AppendLine($"\t\t\t{child.Name_Lower}: map['{child.Name_Upper}'] != null ? map['{child.Name_Upper}'].cast<{model}>().toList() : null,");
+                            source.AppendLine($"\t\t\t{child.Name_Lower}: map['{child.Name_Upper}']?.cast<{model}>().toList(),");
                         }
                         else if (listModelType.GenericArgumentModelType is EnumModelType)
                         {
@@ -182,7 +184,7 @@ namespace FlutterCodeGenerator.ModelTypes
                         else if (listModelType.GenericArgumentModelType is SimpleModelType && !(listModelType.GenericArgumentModelType is ExtraObjectModelType))
                         {
                             var model = listModelType.GenericArgumentModelType.GetFlutterTypeName();
-                            source.AppendLine($"\t\t\t{child.Name_Lower}: map['{child.Name_Upper}'] != null ? map['{child.Name_Upper}'].cast<{model}>().toList() : null,");
+                            source.AppendLine($"\t\t\t{child.Name_Lower}: map['{child.Name_Upper}']?.cast<{model}>().toList(),");
                         }
                         else if (listModelType.GenericArgumentModelType is EnumModelType)
                         {
@@ -200,7 +202,7 @@ namespace FlutterCodeGenerator.ModelTypes
                         if (listModelType.GenericArgumentModelType is SimpleModelType && !(listModelType.GenericArgumentModelType is ExtraObjectModelType))
                         {
                             var model = listModelType.GenericArgumentModelType.GetFlutterTypeName();
-                            source.AppendLine($"\t\t\t{child.Name_Lower}: map['{child.Name_Upper}'] != null ? map['{child.Name_Upper}'].cast<{model}>().toList() : null,");
+                            source.AppendLine($"\t\t\t{child.Name_Lower}: map['{child.Name_Upper}']?.cast<{model}>().toList(),");
                         }
                         else if (listModelType.GenericArgumentModelType is EnumModelType)
                         {
@@ -218,7 +220,7 @@ namespace FlutterCodeGenerator.ModelTypes
                 {
                     var argumentName1 = dictionaryModelType.GenericArgumentModelTypeList[0].GetFlutterTypeName();
                     var argumentName2 = dictionaryModelType.GenericArgumentModelTypeList[1].GetFlutterTypeName();
-                    source.AppendLine($"\t\t\t{child.Name_Lower}: map['{child.Name_Upper}'] != null ? map['{child.Name_Upper}'].cast<{argumentName1},{argumentName2}>() : null,");
+                    source.AppendLine($"\t\t\t{child.Name_Lower}: map['{child.Name_Upper}']?.cast<{argumentName1},{argumentName2}>(),");
                 }
                 else if (child is UserDefinedGenericModelType userDefinedGenericModelType)
                 {
@@ -231,7 +233,7 @@ namespace FlutterCodeGenerator.ModelTypes
                         else if (userDefinedGenericModelType.GenericArgumentModelType is SimpleModelType && !(userDefinedGenericModelType.GenericArgumentModelType is ExtraObjectModelType))
                         {
                             var model = userDefinedGenericModelType.GenericArgumentModelType.GetFlutterTypeName();
-                            source.AppendLine($"\t\t\t{child.Name_Lower}: map['{child.Name_Upper}'] != null ? map['{child.Name_Upper}'].cast<{model}>().toList() : null,");
+                            source.AppendLine($"\t\t\t{child.Name_Lower}: map['{child.Name_Upper}']?.cast<{model}>().toList(),");
                         }
                         else if (userDefinedGenericModelType.GenericArgumentModelType is EnumModelType)
                         {
@@ -249,7 +251,7 @@ namespace FlutterCodeGenerator.ModelTypes
                         if (userDefinedGenericModelType.GenericArgumentModelType is SimpleModelType && !(userDefinedGenericModelType.GenericArgumentModelType is ExtraObjectModelType))
                         {
                             var model = userDefinedGenericModelType.GenericArgumentModelType.GetFlutterTypeName();
-                            source.AppendLine($"\t\t\t{child.Name_Lower}: map['{child.Name_Upper}'] != null ? map['{child.Name_Upper}'].cast<{model}>().toList() : null,");
+                            source.AppendLine($"\t\t\t{child.Name_Lower}: map['{child.Name_Upper}']?.cast<{model}>().toList(),");
                         }
                         else if (userDefinedGenericModelType.GenericArgumentModelType is EnumModelType)
                         {