更新

DocHtml/demoHtml.html

@@ -374,13 +374,17 @@
                         </tr>
                         {{each request.body.raw_para item}}
                         {{if item.key}}
-                        <tr>
-                            <td>{{item.key}}</td>
-                            <td>{{item.value}}</td>
-                            <td><a href="#jump">{{item.field_type}}</a></td>
-                            <td>{{item.not_null == "1" ? '是' : '否'}}</td>
-                            <td>{{item.description == '' ? '暂无描述' : item.description }}</td>
-                        </tr>
+                    <tr>
+                        <td>{{item.key}}</td>
+                        <td>{{item.value}}</td>
+                        {{if item.field_type_value == 1 }}
+                        <td><a href="#{{item.field_type_target_id}}">{{item.field_type}}</a></td>
+                        {{else}}
+                        <td>{{item.field_type}}</td>
+                        {{/if}}
+                        <td>{{item.not_null == "1" ? '是' : '否'}}</td>
+                        <td>{{item.description == '' ? '暂无描述' : item.description }}</td>
+                    </tr>
                         {{/if}}
                         {{/each}}
                     </table>

DocTools/CreateDocHtml.cs

@@ -9,6 +9,8 @@ namespace DocTools
 {
     public class CreateDocHtml
     {
+        private static Dictionary<string, string> PublicEnumDic = new Dictionary<string, string>();
+
         /// <summary>
         /// 创建最基础json信息
         /// </summary>
@@ -575,6 +577,16 @@ namespace DocTools
                             field_type = childTypeStr,
                             value = responseItem.DefaultValue
                         };
+                        //if (childTypeStr.Contains("Enum"))
+                        //{
+                        //    childObject.field_type = "<a href=\"#"+ childTypeStr + "\">" + childObject.field_type + "</a>";
+                        //}
+                        if (childTypeStr.Contains("Enum"))
+                        {
+                            childObject.field_type_value = 1;
+                            var key = "WingInterfaceLibrary.Enum." + childTypeStr;
+                            childObject.field_type_target_id = PublicEnumDic[key];
+                        }
                         if (childTypeStr == "Array" && generalTypeStr != "Object")
                         {
                             childObject.value = "[" + responseItem.DefaultValue + "]";
@@ -619,6 +631,16 @@ namespace DocTools
                             field_type = childTypeStr,
                             value = responseItem.DefaultValue
                         };
+                        //if (childTypeStr.Contains("Enum"))
+                        //{
+                        //    childObject.field_type = "<a href=\"#" + childTypeStr + "\">" + childObject.field_type + "</a>";
+                        //}
+                        if (childTypeStr.Contains("Enum"))
+                        {
+                            childObject.field_type_value = 1;
+                            var key = "WingInterfaceLibrary.Enum." + childTypeStr;
+                            childObject.field_type_target_id = PublicEnumDic[key];
+                        }
                         if (childTypeStr == "Array" && generalTypeStr != "Object")
                         {
                             childObject.value = "[" + responseItem.DefaultValue + "]";
@@ -654,6 +676,7 @@ namespace DocTools
         /// <returns></returns>
         public string GetChildParameterString(string returnTypeStr, List<ParamPropertyEntity> responseList, int level = 2, int retract = 0)
         {
+            List<string> typeList = new List<string>() { "Boolean", "Double", "Float", "Number", "Integer" };
             string resultStr = "";
             string retractStr = "";
             for (int i = 0; i < (retract + 1); i++)
@@ -699,7 +722,14 @@ namespace DocTools
                         }
                         else
                         {
-                            resultStr += "\n" + retractStr + "\"" + responseItem.Name + "\": \"" + responseItem.DefaultValue + "\",    //" + responseItem.Desc;
+                            if (typeList.Contains(childTypeStr) || childTypeStr.Contains("Enum"))
+                            {
+                                resultStr += "\n" + retractStr + "\"" + responseItem.Name + "\": " + responseItem.DefaultValue + ",    //" + responseItem.Desc;
+                            }
+                            else
+                            {
+                                resultStr += "\n" + retractStr + "\"" + responseItem.Name + "\": \"" + responseItem.DefaultValue + "\",    //" + responseItem.Desc;
+                            }
                         }
                         if (responseItem.ParamPropertyList?.Count > 0)
                         {
@@ -772,7 +802,14 @@ namespace DocTools
                         }
                         else
                         {
-                            resultStr += "\n" + retractStr + "\"" + responseItem.Name + "\": \"" + responseItem.DefaultValue + "\",    //" + responseItem.Desc;
+                            if (typeList.Contains(childTypeStr) || childTypeStr.Contains("Enum"))
+                            {
+                                resultStr += "\n" + retractStr + "\"" + responseItem.Name + "\": " + responseItem.DefaultValue + ",    //" + responseItem.Desc;
+                            }
+                            else
+                            {
+                                resultStr += "\n" + retractStr + "\"" + responseItem.Name + "\": \"" + responseItem.DefaultValue + "\",    //" + responseItem.Desc;
+                            }
                         }
                         if (responseItem.ParamPropertyList?.Count > 0)
                         {
@@ -880,6 +917,10 @@ namespace DocTools
                     }
                 }
             };
+            if (!PublicEnumDic.Keys.Contains(enumNamespace))
+            {
+                PublicEnumDic.Add(enumNamespace, errorEntity.local_target_id);
+            }
             return errorEntity;
         }
     }

DocTools/Entity/Doc/ResponseEntity.cs

@@ -23,6 +23,9 @@ namespace DocTools.Entity.Doc
         public string field_type { get; set; } = string.Empty;
 
         public object value { get; set; } = string.Empty;
+        //0表示默认，啥也不干，1-表示为enum类型
+        public int field_type_value { get; set; } = 0;
+        public string field_type_target_id { get; set; } = string.Empty;
     }
 
     public class ResponseResultEntity

DocTools/Helper/CommonHelper.cs

@@ -14,6 +14,7 @@ namespace DocTools.Helper
         /// <returns></returns>
         public static string GetJsonDataTypeByString(string typeStr)
         {
+            var enumStr = "";
             var result = "";
             if (typeStr.Contains("WingInterfaceLibrary") && typeStr.Contains("`1"))
             {
@@ -29,13 +30,16 @@ namespace DocTools.Helper
             }
             else if (typeStr.Contains("Enum"))
             {
+                enumStr = typeStr;
                 typeStr = "Enum";
             }
             switch (typeStr)
             {
+                case "Enum":
+                    result = enumStr;
+                    break;
                 case "Int32":
                 case "System.Int32":
-                case "Enum":
                     result = "Integer";
                     break;
                 case "Dictionary`2":