mirror of
				https://github.com/nsnail/FreeSql.git
				synced 2025-11-04 09:15:27 +08:00 
			
		
		
		
	替换 pageIndex 为 pageNumber
This commit is contained in:
		@@ -932,7 +932,7 @@
 | 
				
			|||||||
            <summary>
 | 
					            <summary>
 | 
				
			||||||
            分页
 | 
					            分页
 | 
				
			||||||
            </summary>
 | 
					            </summary>
 | 
				
			||||||
            <param name="pageIndex">第几页</param>
 | 
					            <param name="pageNumber">第几页</param>
 | 
				
			||||||
            <param name="pageSize">每页多少</param>
 | 
					            <param name="pageSize">每页多少</param>
 | 
				
			||||||
            <returns></returns>
 | 
					            <returns></returns>
 | 
				
			||||||
        </member>
 | 
					        </member>
 | 
				
			||||||
@@ -1331,7 +1331,7 @@
 | 
				
			|||||||
            <summary>
 | 
					            <summary>
 | 
				
			||||||
            分页
 | 
					            分页
 | 
				
			||||||
            </summary>
 | 
					            </summary>
 | 
				
			||||||
            <param name="pageIndex">第几页</param>
 | 
					            <param name="pageNumber">第几页</param>
 | 
				
			||||||
            <param name="pageSize">每页多少</param>
 | 
					            <param name="pageSize">每页多少</param>
 | 
				
			||||||
            <returns></returns>
 | 
					            <returns></returns>
 | 
				
			||||||
        </member>
 | 
					        </member>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -245,10 +245,10 @@ namespace FreeSql {
 | 
				
			|||||||
		/// <summary>
 | 
							/// <summary>
 | 
				
			||||||
		/// 分页
 | 
							/// 分页
 | 
				
			||||||
		/// </summary>
 | 
							/// </summary>
 | 
				
			||||||
		/// <param name="pageIndex">第几页</param>
 | 
							/// <param name="pageNumber">第几页</param>
 | 
				
			||||||
		/// <param name="pageSize">每页多少</param>
 | 
							/// <param name="pageSize">每页多少</param>
 | 
				
			||||||
		/// <returns></returns>
 | 
							/// <returns></returns>
 | 
				
			||||||
		TSelect Page(int pageIndex, int pageSize);
 | 
							TSelect Page(int pageNumber, int pageSize);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		/// <summary>
 | 
							/// <summary>
 | 
				
			||||||
		/// 查询数据前,去重
 | 
							/// 查询数据前,去重
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -73,10 +73,10 @@ namespace FreeSql {
 | 
				
			|||||||
		/// <summary>
 | 
							/// <summary>
 | 
				
			||||||
		/// 分页
 | 
							/// 分页
 | 
				
			||||||
		/// </summary>
 | 
							/// </summary>
 | 
				
			||||||
		/// <param name="pageIndex">第几页</param>
 | 
							/// <param name="pageNumber">第几页</param>
 | 
				
			||||||
		/// <param name="pageSize">每页多少</param>
 | 
							/// <param name="pageSize">每页多少</param>
 | 
				
			||||||
		/// <returns></returns>
 | 
							/// <returns></returns>
 | 
				
			||||||
		ISelectGrouping<TKey, TValue> Page(int pageIndex, int pageSize);
 | 
							ISelectGrouping<TKey, TValue> Page(int pageNumber, int pageSize);
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	public interface ISelectGroupingAggregate<TKey> {
 | 
						public interface ISelectGroupingAggregate<TKey> {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -188,8 +188,8 @@ namespace FreeSql.Internal.CommonProvider {
 | 
				
			|||||||
			if (parms != null) _params.AddRange(_commonUtils.GetDbParamtersByObject(sql, parms));
 | 
								if (parms != null) _params.AddRange(_commonUtils.GetDbParamtersByObject(sql, parms));
 | 
				
			||||||
			return this as TSelect;
 | 
								return this as TSelect;
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
		public TSelect Page(int pageIndex, int pageSize) {
 | 
							public TSelect Page(int pageNumber, int pageSize) {
 | 
				
			||||||
			this.Skip(Math.Max(0, pageIndex - 1) * pageSize);
 | 
								this.Skip(Math.Max(0, pageNumber - 1) * pageSize);
 | 
				
			||||||
			return this.Limit(pageSize) as TSelect;
 | 
								return this.Limit(pageSize) as TSelect;
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -135,9 +135,9 @@ namespace FreeSql.Internal.CommonProvider {
 | 
				
			|||||||
		}
 | 
							}
 | 
				
			||||||
		public ISelectGrouping<TKey, TValue> Take(int limit) => this.Limit(limit);
 | 
							public ISelectGrouping<TKey, TValue> Take(int limit) => this.Limit(limit);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		public ISelectGrouping<TKey, TValue> Page(int pageIndex, int pageSize) {
 | 
							public ISelectGrouping<TKey, TValue> Page(int pageNumber, int pageSize) {
 | 
				
			||||||
			var method = _select.GetType().GetMethod("Page", new[] { typeof(int), typeof(int) });
 | 
								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;
 | 
								return this;
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user