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

增加了PageNumber 和PageSize 的规约配置 #4

Merged
merged 1 commit into from
Jul 10, 2024
Merged

增加了PageNumber 和PageSize 的规约配置 #4

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
8 changes: 4 additions & 4 deletions ReZero/SuperAPI/ApiProvider/ParameterProvider/BindHttpParameters.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,13 @@ private void BindPageParameters(DataModel? dataModel, HttpContext context, Dicti
{
if (dataModel?.CommonPage != null)
{
var pageNumberPar = dataModel?.DefaultParameters?.FirstOrDefault(it => it?.Name?.EqualsCase(nameof(DataModelPageParameter.PageNumber)) == true);
var pageNumberPar = dataModel?.DefaultParameters?.FirstOrDefault(it => it?.Name?.EqualsCase(SuperAPIModule._apiOptions?.InterfaceOptions.PageNumberPropName) == true);
if (pageNumberPar != null)
{
pageNumberPar.Value = GetParameterValueFromRequest(pageNumberPar, context, formDatas);
dataModel!.CommonPage.PageNumber = Convert.ToInt32(pageNumberPar.Value ?? "1");
}
var pageSizePar = dataModel?.DefaultParameters?.FirstOrDefault(it => it?.Name?.EqualsCase(nameof(DataModelPageParameter.PageSize)) == true);
var pageSizePar = dataModel?.DefaultParameters?.FirstOrDefault(it => it?.Name?.EqualsCase(SuperAPIModule._apiOptions?.InterfaceOptions.PageSizePropName) == true);
if (pageSizePar != null)
{
pageSizePar.Value = GetParameterValueFromRequest(pageSizePar, context, formDatas);
Expand Down Expand Up @@ -145,8 +145,8 @@ private void UpdateWhereItemValue(HttpContext context, Dictionary<string, object

private static bool NoPageParameters(DataModelDefaultParameter it)
{
return it.Name != nameof(DataModelPageParameter.PageNumber) &&
it.Name != nameof(DataModelPageParameter.PageSize);
return it.Name != SuperAPIModule._apiOptions?.InterfaceOptions.PageNumberPropName &&
it.Name != SuperAPIModule._apiOptions?.InterfaceOptions.PageSizePropName;
}

private static bool IsUserName(DataModelDefaultParameter item)
Expand Down
4 changes: 2 additions & 2 deletions ReZero/SuperAPI/DataInitializerService/Items/InterfaceItems/DatabaseInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,8 +297,8 @@ private void GetDatabaseInfoList()
DefaultParameters = new List<DataModelDefaultParameter>() {

new DataModelDefaultParameter() { Name = nameof(ZeroDatabaseInfo.Name), FieldOperator=FieldOperatorType.Like, ValueType = typeof(string).Name,Value=null , Description = TextHandler.GetCommonText("库说明", "Name") },
new DataModelDefaultParameter() { Name=nameof(DataModelPageParameter.PageNumber) ,Value=1,FieldOperator=FieldOperatorType.Equal, ValueType = typeof(long).Name, Description = TextHandler.GetCommonText("第几页", "Page number") },
new DataModelDefaultParameter() { Name=nameof(DataModelPageParameter.PageSize) ,Value=20,FieldOperator=FieldOperatorType.Equal, ValueType = typeof(long).Name, Description = TextHandler.GetCommonText("每页几条", "Pageize") },
new DataModelDefaultParameter() { Name=SuperAPIModule._apiOptions?.InterfaceOptions.PageNumberPropName ,Value=1,FieldOperator=FieldOperatorType.Equal, ValueType = typeof(long).Name, Description = TextHandler.GetCommonText("第几页", "Page number") },
new DataModelDefaultParameter() { Name=SuperAPIModule._apiOptions?.InterfaceOptions.PageSizePropName ,Value=20,FieldOperator=FieldOperatorType.Equal, ValueType = typeof(long).Name, Description = TextHandler.GetCommonText("每页几条", "Pageize") },
new DataModelDefaultParameter() { Name = nameof(ZeroInterfaceCategory.IsDeleted), FieldOperator=FieldOperatorType.Equal, ValueType = typeof(bool).Name,Value="false",ValueIsReadOnly=true, Description = TextHandler.GetCommonText("IsDeleted", "IsDeleted") },
}
};
Expand Down
4 changes: 2 additions & 2 deletions ReZero/SuperAPI/DataInitializerService/Items/InterfaceItems/EntityInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,8 +283,8 @@ private void GetEntityInoList()
new DataModelDefaultParameter() { Name = nameof(ZeroEntityInfo.ClassName), FieldOperator=FieldOperatorType.Like, ValueType = typeof(string).Name,Value=null , Description = TextHandler.GetCommonText("名称", "class Name") },
new DataModelDefaultParameter() { Name = nameof(ZeroEntityInfo.DbTableName),MergeForName=nameof(ZeroEntityInfo.ClassName) },
new DataModelDefaultParameter() { Name = nameof(ZeroEntityInfo.Description),MergeForName=nameof(ZeroEntityInfo.ClassName) },
new DataModelDefaultParameter() { Name=nameof(DataModelPageParameter.PageNumber) ,Value=1,FieldOperator=FieldOperatorType.Equal, ValueType = typeof(long).Name, Description = TextHandler.GetCommonText("第几页", "Page number") },
new DataModelDefaultParameter() { Name=nameof(DataModelPageParameter.PageSize) ,Value=20,FieldOperator=FieldOperatorType.Equal, ValueType = typeof(long).Name, Description = TextHandler.GetCommonText("每页几条", "Pageize") },
new DataModelDefaultParameter() { Name=SuperAPIModule._apiOptions?.InterfaceOptions.PageNumberPropName ,Value=1,FieldOperator=FieldOperatorType.Equal, ValueType = typeof(long).Name, Description = TextHandler.GetCommonText("第几页", "Page number") },
new DataModelDefaultParameter() { Name=SuperAPIModule._apiOptions?.InterfaceOptions.PageSizePropName ,Value=20,FieldOperator=FieldOperatorType.Equal, ValueType = typeof(long).Name, Description = TextHandler.GetCommonText("每页几条", "Pageize") },
new DataModelDefaultParameter() { Name="OrderByType" ,Value=20,FieldOperator=FieldOperatorType.Equal, ValueType = typeof(string).Name, Description = TextHandler.GetCommonText("排序类型", "SortType") },
new DataModelDefaultParameter() { Name="OrderByName" ,Value=20,FieldOperator=FieldOperatorType.Equal, ValueType = typeof(string).Name, Description = TextHandler.GetCommonText("排序字段", "SortName") }
}
Expand Down
4 changes: 2 additions & 2 deletions ReZero/SuperAPI/DataInitializerService/Items/InterfaceItems/Interface.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,8 @@ private void Dynamic()
new DataModelDefaultParameter() { Name = nameof(ZeroInterfaceList.IsAttributeMethod),Value=false,ValueIsReadOnly=true,FieldOperator=FieldOperatorType.Equal, ValueType = typeof(bool).Name, Description = TextHandler.GetCommonText("是否是特性方法", "Is attribute method") },
new DataModelDefaultParameter(){ Name="Url",MergeForName="Name",ValueIsReadOnly=true, FieldOperator=FieldOperatorType.Like, ValueType=typeof(string).Name, Description=TextHandler.GetCommonText("Url","Url") },
new DataModelDefaultParameter(){ Name="DatabaseId", FieldOperator=FieldOperatorType.Equal, ValueType=typeof(long).Name, Description=TextHandler.GetCommonText("数据库Id","Database id") },
new DataModelDefaultParameter() { Name=nameof(DataModelPageParameter.PageNumber) ,Value=1,FieldOperator=FieldOperatorType.Equal, ValueType = typeof(long).Name, Description = TextHandler.GetCommonText("第几页", "Page number") },
new DataModelDefaultParameter() { Name=nameof(DataModelPageParameter.PageSize) ,Value=20,FieldOperator=FieldOperatorType.Equal, ValueType = typeof(long).Name, Description = TextHandler.GetCommonText("每页几条", "Pageize") }
new DataModelDefaultParameter() { Name=SuperAPIModule._apiOptions?.InterfaceOptions.PageNumberPropName ,Value=1,FieldOperator=FieldOperatorType.Equal, ValueType = typeof(long).Name, Description = TextHandler.GetCommonText("第几页", "Page number") },
new DataModelDefaultParameter() { Name=SuperAPIModule._apiOptions?.InterfaceOptions.PageSizePropName ,Value=20,FieldOperator=FieldOperatorType.Equal, ValueType = typeof(long).Name, Description = TextHandler.GetCommonText("每页几条", "Pageize") }
}
};
});
Expand Down
4 changes: 2 additions & 2 deletions ReZero/SuperAPI/DataInitializerService/Items/InterfaceItems/InterfaceCategory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,8 @@ private void GetDynamicInterfaceCategoryPageList()
new DataModelDefaultParameter() { Name = nameof(ZeroInterfaceCategory.ParentId), FieldOperator=FieldOperatorType.Equal, ValueType = typeof(long).Name,Value=200,ValueIsReadOnly=true, Description = TextHandler.GetCommonText("上级Id", "ParentId") },
new DataModelDefaultParameter() { Name = nameof(ZeroInterfaceCategory.IsDeleted), FieldOperator=FieldOperatorType.Equal, ValueType = typeof(bool).Name,Value="false",ValueIsReadOnly=true, Description = TextHandler.GetCommonText("IsDeleted", "IsDeleted") },
new DataModelDefaultParameter() { Name = nameof(ZeroInterfaceCategory.Name), FieldOperator=FieldOperatorType.Like, ValueType = typeof(string).Name,Value=null , Description = TextHandler.GetCommonText("名称", "Name") },
new DataModelDefaultParameter() { Name=nameof(DataModelPageParameter.PageNumber) ,Value=1,FieldOperator=FieldOperatorType.Equal, ValueType = typeof(long).Name, Description = TextHandler.GetCommonText("第几页", "Page number") },
new DataModelDefaultParameter() { Name=nameof(DataModelPageParameter.PageSize) ,Value=20,FieldOperator=FieldOperatorType.Equal, ValueType = typeof(long).Name, Description = TextHandler.GetCommonText("每页几条", "Pageize") }
new DataModelDefaultParameter() { Name=SuperAPIModule._apiOptions?.InterfaceOptions.PageNumberPropName ,Value=1,FieldOperator=FieldOperatorType.Equal, ValueType = typeof(long).Name, Description = TextHandler.GetCommonText("第几页", "Page number") },
new DataModelDefaultParameter() { Name=SuperAPIModule._apiOptions?.InterfaceOptions.PageSizePropName ,Value=20,FieldOperator=FieldOperatorType.Equal, ValueType = typeof(long).Name, Description = TextHandler.GetCommonText("每页几条", "Pageize") }
}
};
});
Expand Down
4 changes: 2 additions & 2 deletions ReZero/SuperAPI/DataInitializerService/Items/InterfaceItems/Template.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,8 +238,8 @@ private void GetTemplatePageList()
DefaultParameters = new List<DataModelDefaultParameter>() {
new DataModelDefaultParameter() { Name = nameof(ZeroTemplate.Title), FieldOperator=FieldOperatorType.Like, ValueType = typeof(string).Name ,ValueIsReadOnly=true, Description = TextHandler.GetCommonText("标题", "Title") },
new DataModelDefaultParameter() { Name = nameof(ZeroTemplate.IsDeleted), FieldOperator=FieldOperatorType.Equal, ValueType = typeof(bool).Name,Value="false",ValueIsReadOnly=true, Description = TextHandler.GetCommonText("IsDeleted", "IsDeleted") },
new DataModelDefaultParameter() { Name=nameof(DataModelPageParameter.PageNumber) ,Value=1,FieldOperator=FieldOperatorType.Equal, ValueType = typeof(long).Name, Description = TextHandler.GetCommonText("第几页", "Page number") },
new DataModelDefaultParameter() { Name=nameof(DataModelPageParameter.PageSize) ,Value=20,FieldOperator=FieldOperatorType.Equal, ValueType = typeof(long).Name, Description = TextHandler.GetCommonText("每页几条", "Pageize") }
new DataModelDefaultParameter() { Name=SuperAPIModule._apiOptions?.InterfaceOptions.PageNumberPropName ,Value=1,FieldOperator=FieldOperatorType.Equal, ValueType = typeof(long).Name, Description = TextHandler.GetCommonText("第几页", "Page number") },
new DataModelDefaultParameter() { Name=SuperAPIModule._apiOptions?.InterfaceOptions.PageSizePropName ,Value=20,FieldOperator=FieldOperatorType.Equal, ValueType = typeof(long).Name, Description = TextHandler.GetCommonText("每页几条", "Pageize") }
}
};
});
Expand Down
2 changes: 2 additions & 0 deletions ReZero/SuperAPI/Entities/Options/ReZeroOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,8 @@ public DependencyInjectionOptions(params Assembly[] assemblies)
public class InterfaceOptions
{
public string? AuthorizationLocalStorageName { get; set; } = "RezeroLocalStorage";
public string PageNumberPropName { set; get; } = "PageNumber";
public string PageSizePropName { set; get; } = "PageSize";
public DefaultSuperApiAop SuperApiAop { get; set; } = new DefaultSuperApiAop();

public Func<object, object>? MergeDataToStandardDtoFunc { get; set; }
Expand Down
4 changes: 2 additions & 2 deletions ...atorAPI/Items/MethodApiSaveInterfaceList/Items/SaveInterfaceListQueryCommon/Items/Page.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ private static void SetPage(SaveInterfaceListModel saveInterfaceListModel, ZeroI
};
zeroInterfaceList.DataModel.DefaultParameters!.AddRange(
new List<DataModelDefaultParameter>() {
new DataModelDefaultParameter() { Name=nameof(DataModelPageParameter.PageNumber) ,Value=1,FieldOperator=FieldOperatorType.Equal, ValueType = typeof(long).Name, Description = TextHandler.GetCommonText("第几页", "Page number") },
new DataModelDefaultParameter() { Name=nameof(DataModelPageParameter.PageSize) ,Value=20,FieldOperator=FieldOperatorType.Equal, ValueType = typeof(long).Name, Description = TextHandler.GetCommonText("每页几条", "Pageize") }
new DataModelDefaultParameter() { Name=SuperAPIModule._apiOptions?.InterfaceOptions.PageNumberPropName ,Value=1,FieldOperator=FieldOperatorType.Equal, ValueType = typeof(long).Name, Description = TextHandler.GetCommonText("第几页", "Page number") },
new DataModelDefaultParameter() { Name=SuperAPIModule._apiOptions?.InterfaceOptions.PageSizePropName ,Value=20,FieldOperator=FieldOperatorType.Equal, ValueType = typeof(long).Name, Description = TextHandler.GetCommonText("每页几条", "Pageize") }
}
);
zeroInterfaceList.CustomResultModel = new ResultModel()
Expand Down