mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-01 12:42:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/top-think/framework

Browse Source
This commit is contained in:
thinkphp
2016-07-06 19:12:56 +08:00
parent 4acbc4077d f19f517c94
commit d5353d1e32
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
library/think/Model.php
View File

@@ -34,6 +34,7 @@ use think\paginator\Collection as PaginatorCollection;
* @method static integer avg($field = '*') AVG查询
* @method static setField($field, $value = '')
* @method static Query where($field, $op = null, $condition = null) 指定AND查询条件
* @method static static findOrFail($data = null) 查找单条记录 如果不存在则抛出异常
*
*/
abstract class Model implements \JsonSerializable, \ArrayAccess

20
library/think/paginator/driver/Bootstrap.php
View File

@@ -66,23 +66,23 @@ class Bootstrap extends Paginator
'last' => null
];
$length = 3;
$side = 3;
$window = $side * 2;
if ($this->lastPage < $length * 4) {
if ($this->lastPage < $window + 6) {
$block['first'] = $this->getUrlRange(1, $this->lastPage);
} elseif ($this->currentPage <= $length * 2) {
$block['first'] = $this->getUrlRange(1, $length * 2 + 2);
} elseif ($this->currentPage <= $window) {
$block['first'] = $this->getUrlRange(1, $window + 2);
$block['last'] = $this->getUrlRange($this->lastPage - 1, $this->lastPage);
} elseif ($this->currentPage > ($this->lastPage - $length * 2)) {
} elseif ($this->currentPage > ($this->lastPage - $window)) {
$block['first'] = $this->getUrlRange(1, 2);
$block['last'] = $this->getUrlRange($this->lastPage - $length * 2 + 2, $this->lastPage);
$block['last'] = $this->getUrlRange($this->lastPage - ($window + 2), $this->lastPage);
} else {
$block['first'] = $this->getUrlRange(1, 2);
$block['slider'] = $this->getUrlRange($this->currentPage - $length, $this->currentPage + $length);
$block['slider'] = $this->getUrlRange($this->currentPage - $side, $this->currentPage + $side);
$block['last'] = $this->getUrlRange($this->lastPage - 1, $this->lastPage);
}
$html = '';
if (is_array($block['first'])) {
@@ -132,7 +132,7 @@ class Bootstrap extends Paginator
* 生成一个可点击的按钮
*
* @param string $url
* @param int $page
* @param int $page
* @return string
*/
protected function getAvailablePageWrapper($url, $page)
@@ -193,7 +193,7 @@ class Bootstrap extends Paginator
* 生成普通页码按钮
*
* @param string $url
* @param int $page
* @param int $page
* @return string
*/
protected function getPageLinkWrapper($url, $page)