Merge pull request #6352 from abpframework/maliming/dataType

Set dataType to text for string return values for dynamic JavaScript proxies.
abpframework · Dec 1, 2020 · c615aed · c615aed
2 parents d2d873a + 5f7f388
commit c615aed
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/...olo.Abp.Http/Volo/Abp/Http/ProxyScripting/Generators/JQuery/JQueryProxyScriptGenerator.cs b/...olo.Abp.Http/Volo/Abp/Http/ProxyScripting/Generators/JQuery/JQueryProxyScriptGenerator.cs
@@ -25,7 +25,7 @@ public string CreateScript(ApplicationApiDescriptionModel model)
 
             script.AppendLine("/* This file is automatically generated by ABP framework to use MVC Controllers from javascript. */");
             script.AppendLine();
-            
+
             foreach (var module in model.Modules.Values)
             {
                 script.AppendLine();
@@ -99,9 +99,12 @@ private static void AddActionScript(StringBuilder script, string controllerName,
             AddAjaxCallParameters(script, action);
 
             var ajaxParamsIsFromForm = action.Parameters.Any(x => x.BindingSourceId == ParameterBindingSources.Form);
+            var dataType = action.ReturnValue.Type == ReturnValueApiDescriptionModel.Create(typeof(string)).Type
+                ? "{ dataType: 'text' }, "
+                : string.Empty;
             script.AppendLine(ajaxParamsIsFromForm
-                ? "      }, $.extend(true, {}, ajaxParams, { contentType: 'application/x-www-form-urlencoded; charset=UTF-8' })));"
-                : "      }, ajaxParams));");
+                ? "      }, $.extend(true, {}, " + dataType + "{ contentType: 'application/x-www-form-urlencoded; charset=UTF-8' }, ajaxParams)));"
+                : "      }, " + dataType + "ajaxParams));");
 
             script.AppendLine("    };");
         }
@@ -159,7 +162,7 @@ private static void AddAjaxCallParameters(StringBuilder script, ActionApiDescrip
                     script.Append("        data: " + formData);
                 }
             }
-            
+
             script.AppendLine();
         }
 
@@ -191,7 +194,7 @@ private static Dictionary<ActionApiDescriptionModel, string> CalculateNormalized
 
             return result;
         }
-        
+
         private static void AddInitializedEventTrigger(StringBuilder script)
         {
             script.AppendLine();
@@ -213,4 +216,4 @@ private static string CamelCaseWithNamespace(string name)
             return name.Split('.').Select(n => n.ToCamelCase()).JoinAsString(".");
         }
     }
-}
+}