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

修正分页类

Browse Source
This commit is contained in:
yunwuxin
2016-05-09 12:31:53 +08:00
parent 4633f240d0
commit 67fd89cace
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
library/think/Paginator.php
View File

@@ -44,7 +44,7 @@ abstract class Paginator
'fragment' => '' 'fragment' => ''
]; ];
public function __construct(Collection $items, $listRows, $currentPage = null, $simple = false, $total = null, $options = []) public function __construct($items, $listRows, $currentPage = null, $simple = false, $total = null, $options = [])
{ {
$this->options = array_merge($this->options, $options); $this->options = array_merge($this->options, $options);
@@ -53,17 +53,18 @@ abstract class Paginator
$this->simple = $simple; $this->simple = $simple;
$this->listRows = $listRows; $this->listRows = $listRows;
$this->items = PaginatorCollection::make($items, $this);
if ($simple) { if ($simple) {
$this->currentPage = $this->setCurrentPage($currentPage); $this->currentPage = $this->setCurrentPage($currentPage);
$this->hasMore = count($items) > ($this->listRows); $this->hasMore = count($this->items) > ($this->listRows);
$items = $items->slice(0, $this->listRows); $this->items = $this->items->slice(0, $this->listRows);
} else { } else {
$this->lastPage = (int)ceil($total / $listRows); $this->lastPage = (int)ceil($total / $listRows);
$this->currentPage = $this->setCurrentPage($currentPage); $this->currentPage = $this->setCurrentPage($currentPage);
$this->hasMore = $this->currentPage < $this->lastPage; $this->hasMore = $this->currentPage < $this->lastPage;
} }
$this->items = PaginatorCollection::make($items, $this);
} }
public function items() public function items()
@@ -165,6 +166,7 @@ abstract class Paginator
/** /**
* 数据是否足够分页 * 数据是否足够分页
* @return boolean
*/ */
public function hasPages() public function hasPages()
{ {