Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make proxy script support [FromForm] model binding. #2751

Merged
merged 1 commit into from
Feb 5, 2020
Merged

Make proxy script support [FromForm] model binding. #2751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .../Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AspNetCoreApiDescriptionModelProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,10 @@ private void AddParameterDescriptionsToModel(ActionApiDescriptionModel actionMod
parameterDescription.RouteInfo?.IsOptional ?? false,
parameterDescription.RouteInfo?.DefaultValue,
parameterDescription.RouteInfo?.Constraints?.Select(c => c.GetType().Name).ToArray(),
parameterDescription.Source.Id
parameterDescription.Source.Id,
parameterDescription.ModelMetadata.ContainerType != null
? parameterDescription.ParameterDescriptor.Name
: string.Empty
)
);
}
Expand Down
9 changes: 6 additions & 3 deletions framework/src/Volo.Abp.Http/Volo/Abp/Http/Modeling/ParameterApiDescriptionModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;

namespace Volo.Abp.Http.Modeling
{
Expand All @@ -19,12 +19,14 @@ public class ParameterApiDescriptionModel

public string BindingSourceId { get; set; }

public string DescriptorName { get; set; }

private ParameterApiDescriptionModel()
{

}

public static ParameterApiDescriptionModel Create(string name, string nameOnMethod, Type type, bool isOptional = false, object defaultValue = null, string[] constraintTypes = null, string bindingSourceId = null)
public static ParameterApiDescriptionModel Create(string name, string nameOnMethod, Type type, bool isOptional = false, object defaultValue = null, string[] constraintTypes = null, string bindingSourceId = null, string descriptorName = null)
{
return new ParameterApiDescriptionModel
{
Expand All @@ -34,7 +36,8 @@ public static ParameterApiDescriptionModel Create(string name, string nameOnMeth
IsOptional = isOptional,
DefaultValue = defaultValue,
ConstraintTypes = constraintTypes,
BindingSourceId = bindingSourceId
BindingSourceId = bindingSourceId,
DescriptorName = descriptorName
};
}
}
Expand Down
6 changes: 5 additions & 1 deletion ...olo.Abp.Http/Volo/Abp/Http/ProxyScripting/Generators/JQuery/JQueryProxyScriptGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,11 @@ private static void AddActionScript(StringBuilder script, string controllerName,

AddAjaxCallParameters(script, action);

script.AppendLine(" }, ajaxParams));;");
var ajaxParamsIsFromForm = action.Parameters.Any(x => x.BindingSourceId == ParameterBindingSources.Form);
script.AppendLine(ajaxParamsIsFromForm
? " }, $.extend(true, {}, ajaxParams, { contentType: 'application/x-www-form-urlencoded; charset=UTF-8' })));"
: " }, ajaxParams));");

script.AppendLine(" };");
}

Expand Down
2 changes: 1 addition & 1 deletion framework/src/Volo.Abp.Http/Volo/Abp/Http/ProxyScripting/Generators/ProxyScriptingHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public static string GenerateFormPostData(ActionApiDescriptionModel action, int
return null;
}

return ProxyScriptingJsFuncHelper.CreateJsObjectLiteral(parameters, indent);
return ProxyScriptingJsFuncHelper.CreateJsFormPostData(parameters, indent);
}

private static string ReplacePathVariables(string url, IList<ParameterApiDescriptionModel> actionParameters)
Expand Down
34 changes: 31 additions & 3 deletions ...k/src/Volo.Abp.Http/Volo/Abp/Http/ProxyScripting/Generators/ProxyScriptingJsFuncHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@ public static string WrapWithBracketsOrWithDotPrefix(string name)
public static string GetParamNameInJsFunc(ParameterApiDescriptionModel parameterInfo)
{
return parameterInfo.Name == parameterInfo.NameOnMethod
? NormalizeJsVariableName(parameterInfo.Name.ToCamelCase(), ".")
: NormalizeJsVariableName(parameterInfo.NameOnMethod.ToCamelCase()) + "." + NormalizeJsVariableName(parameterInfo.Name.ToCamelCase(), ".");
? NormalizeJsVariableName(parameterInfo.Name.ToCamelCase(), ".")
: NormalizeJsVariableName(parameterInfo.NameOnMethod.ToCamelCase()) + "." + NormalizeJsVariableName(parameterInfo.Name.ToCamelCase(), ".");
}

public static string CreateJsObjectLiteral(ParameterApiDescriptionModel[] parameters, int indent = 0)
Expand All @@ -131,9 +131,37 @@ public static string CreateJsObjectLiteral(ParameterApiDescriptionModel[] parame
return sb.ToString();
}

public static string GetFormPostParamNameInJsFunc(ParameterApiDescriptionModel parameterInfo)
{
return parameterInfo.Name == parameterInfo.NameOnMethod
? NormalizeJsVariableName((parameterInfo.DescriptorName + parameterInfo.Name).ToCamelCase(), ".")
: NormalizeJsVariableName(parameterInfo.NameOnMethod.ToCamelCase()) + "." + NormalizeJsVariableName((parameterInfo.DescriptorName + parameterInfo.Name).ToCamelCase(), ".");
}

public static string CreateJsFormPostData(ParameterApiDescriptionModel[] parameters, int indent)
{
var sb = new StringBuilder();

for (var i = 0; i < parameters.Length; i++)
{
var and = i < parameters.Length - 1 ? " + '&' + " : string.Empty;

var parameterName = parameters[i].DescriptorName.IsNullOrWhiteSpace()
? parameters[i].Name
: $"{parameters[i].DescriptorName}.{parameters[i].Name}";

sb.Append($"'{parameterName}=' + {GetFormPostParamNameInJsFunc(parameters[i])}{and}");
}

return sb.ToString();
}

public static string GenerateJsFuncParameterList(ActionApiDescriptionModel action, string ajaxParametersName)
{
var methodParamNames = action.ParametersOnMethod.Select(p => p.Name).Distinct().ToList();
var paramsIsFromForm = action.Parameters.Any(x => x.BindingSourceId == ParameterBindingSources.Form);
var methodParamNames = paramsIsFromForm
? action.Parameters.Select(p => p.DescriptorName + p.Name).Distinct().ToList()
: action.ParametersOnMethod.Select(p => p.Name).Distinct().ToList();
methodParamNames.Add(ajaxParametersName);
return methodParamNames.Select(prmName => NormalizeJsVariableName(prmName.ToCamelCase())).JoinAsString(", ");
}
Expand Down