From 7a625be8c9c1a18093741b7ff28d9dec3e35704a Mon Sep 17 00:00:00 2001
From: 28810 <28810@YEXIANGQIN>
Date: Mon, 6 May 2019 23:25:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=BF=E6=8D=A2=20pageIndex=20=E4=B8=BA=20pa?=
=?UTF-8?q?geNumber?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
FreeSql/FreeSql.xml | 4 ++--
FreeSql/Interface/Curd/ISelect/ISelect0.cs | 4 ++--
FreeSql/Interface/Curd/ISelect/ISelectGrouping.cs | 4 ++--
.../Internal/CommonProvider/SelectProvider/Select0Provider.cs | 4 ++--
.../CommonProvider/SelectProvider/SelectGroupingProvider.cs | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/FreeSql/FreeSql.xml b/FreeSql/FreeSql.xml
index 515e14e5..26420e77 100644
--- a/FreeSql/FreeSql.xml
+++ b/FreeSql/FreeSql.xml
@@ -932,7 +932,7 @@
分页
- 第几页
+ 第几页
每页多少
@@ -1331,7 +1331,7 @@
分页
- 第几页
+ 第几页
每页多少
diff --git a/FreeSql/Interface/Curd/ISelect/ISelect0.cs b/FreeSql/Interface/Curd/ISelect/ISelect0.cs
index 9a174962..562d26ed 100644
--- a/FreeSql/Interface/Curd/ISelect/ISelect0.cs
+++ b/FreeSql/Interface/Curd/ISelect/ISelect0.cs
@@ -245,10 +245,10 @@ namespace FreeSql {
///
/// 分页
///
- /// 第几页
+ /// 第几页
/// 每页多少
///
- TSelect Page(int pageIndex, int pageSize);
+ TSelect Page(int pageNumber, int pageSize);
///
/// 查询数据前,去重
diff --git a/FreeSql/Interface/Curd/ISelect/ISelectGrouping.cs b/FreeSql/Interface/Curd/ISelect/ISelectGrouping.cs
index 59532332..f63f7803 100644
--- a/FreeSql/Interface/Curd/ISelect/ISelectGrouping.cs
+++ b/FreeSql/Interface/Curd/ISelect/ISelectGrouping.cs
@@ -73,10 +73,10 @@ namespace FreeSql {
///
/// 分页
///
- /// 第几页
+ /// 第几页
/// 每页多少
///
- ISelectGrouping Page(int pageIndex, int pageSize);
+ ISelectGrouping Page(int pageNumber, int pageSize);
}
public interface ISelectGroupingAggregate {
diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select0Provider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select0Provider.cs
index 403629c5..6f997867 100644
--- a/FreeSql/Internal/CommonProvider/SelectProvider/Select0Provider.cs
+++ b/FreeSql/Internal/CommonProvider/SelectProvider/Select0Provider.cs
@@ -188,8 +188,8 @@ namespace FreeSql.Internal.CommonProvider {
if (parms != null) _params.AddRange(_commonUtils.GetDbParamtersByObject(sql, parms));
return this as TSelect;
}
- public TSelect Page(int pageIndex, int pageSize) {
- this.Skip(Math.Max(0, pageIndex - 1) * pageSize);
+ public TSelect Page(int pageNumber, int pageSize) {
+ this.Skip(Math.Max(0, pageNumber - 1) * pageSize);
return this.Limit(pageSize) as TSelect;
}
diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/SelectGroupingProvider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/SelectGroupingProvider.cs
index f02d8a9e..dc139735 100644
--- a/FreeSql/Internal/CommonProvider/SelectProvider/SelectGroupingProvider.cs
+++ b/FreeSql/Internal/CommonProvider/SelectProvider/SelectGroupingProvider.cs
@@ -135,9 +135,9 @@ namespace FreeSql.Internal.CommonProvider {
}
public ISelectGrouping Take(int limit) => this.Limit(limit);
- public ISelectGrouping Page(int pageIndex, int pageSize) {
+ public ISelectGrouping Page(int pageNumber, int pageSize) {
var method = _select.GetType().GetMethod("Page", new[] { typeof(int), typeof(int) });
- method.Invoke(_select, new object[] { pageIndex, pageSize });
+ method.Invoke(_select, new object[] { pageNumber, pageSize });
return this;
}
}