调试

DocTools/CreateDocHtml.cs

@@ -632,21 +632,27 @@ namespace DocTools
                         //}
                         if (childTypeStr.Contains("Enum"))
                         {
-                            var key = "WingInterfaceLibrary.Enum." + childTypeStr;
+                            //var key = "WingInterfaceLibrary.Enum." + childTypeStr;
+                            var key = childTypeStr;
                             if (PublicEnumDic.Keys.Contains(key))
                             {
                                 childObject.field_type_value = 1;
                                 childObject.field_type_target_id = PublicEnumDic[key];
                             }
+                            var arr = childTypeStr.Split('.');
+                            childObject.field_type = arr[arr.Length - 1];
                         }
                         if (childTypeStr == "Array" && generalTypeStr != "Object")
                         {
                             childObject.value = "[" + responseItem.DefaultValue + "]";
                         }
                         childObject.key = typeStr + "." + responseItem.Name;
-                        if (typeStr != "result")
+                        if (typeStr == "params")
                         {
                             childObject.key = typeStr + "[0]." + responseItem.Name;
+                        }
+                        if (typeStr != "result")
+                        {
                             childObject.not_null = responseItem.IsNotNull;
                         }
                         resultList.Add(childObject);
@@ -690,12 +696,15 @@ namespace DocTools
                         //}
                         if (childTypeStr.Contains("Enum"))
                         {
-                            var key = "WingInterfaceLibrary.Enum." + childTypeStr;
+                            //var key = "WingInterfaceLibrary.Enum." + childTypeStr;
+                            var key = childTypeStr;
                             if (PublicEnumDic.Keys.Contains(key))
                             {
                                 childObject.field_type_value = 1;
                                 childObject.field_type_target_id = PublicEnumDic[key];
                             }
+                            var arr = childTypeStr.Split('.');
+                            childObject.field_type = arr[arr.Length - 1];
                         }
                         if (childTypeStr == "Array" && generalTypeStr != "Object")
                         {

DocTools/Helper/CommonHelper.cs

@@ -15,8 +15,13 @@ namespace DocTools.Helper
         public static string GetJsonDataTypeByString(string typeStr)
         {
             var enumStr = "";
-            var result = "";
-            if (typeStr.Contains("WingInterfaceLibrary") && typeStr.Contains("`1"))
+            string result;
+            if (typeStr.Contains("AccountString") || typeStr.Contains("BaseParamsString") || typeStr.Contains("BaseString") || typeStr.Contains("EmailString") 
+                || typeStr.Contains("PasswordString") || typeStr.Contains("PhoneString") || typeStr.Contains("UrlString") || typeStr.Contains("VerificationCode"))
+            {
+                typeStr = "System.String";
+            }
+            else if (typeStr.Contains("WingInterfaceLibrary") && typeStr.Contains("`1"))
             {
                 typeStr = "Object";
             }

DocTools/LoadData.cs

@@ -391,14 +391,25 @@ namespace DocTools
                                             propertyModel.TypeFullName = tuple.Item2;
                                         }
                                     }
+                                    else if(item.PropertyType.FullName.Contains("WingInterfaceLibrary.Enum."))
+                                    {
+                                        propertyModel.TypeFullName = item.PropertyType.FullName;
+                                    }
                                     else
                                     {
+                                        var propertyModelTemp = new ParamPropertyEntity();
+                                        propertyModelTemp.TypeFullName = item.PropertyType.FullName;
+                                        propertyModelTemp.DefaultValue = "";
+                                        propertyModelTemp.Desc = desc;
+                                        propertyModelTemp.IsNotNull = memberEntity.Code;
+                                        propertyModelTemp.Name = item.Name; 
                                         var tuple = GetRequestParameterPropertyList(item.PropertyType.FullName);
-                                        propertyModel.ParamPropertyList = tuple.Item1;
+                                        propertyModelTemp.ParamPropertyList = tuple.Item1;
                                         if (!string.IsNullOrEmpty(tuple.Item2))
                                         {
-                                            propertyModel.TypeFullName = tuple.Item2;
+                                            propertyModelTemp.TypeFullName = tuple.Item2;
                                         }
+                                        propertyModel.ParamPropertyList.Add(propertyModelTemp);
                                     }
                                 }
                                 else
@@ -434,6 +445,10 @@ namespace DocTools
                                             propertyModel.ParamPropertyList.Add(propertyModelTemp);
                                         }
                                     }
+                                    else if (fxClassNamespace.Contains("WingInterfaceLibrary.Enum."))
+                                    {
+                                        propertyModel.TypeFullName = fxClassNamespace;
+                                    }
                                     else
                                     {
                                         propertyModel.GenericityType = "String";