diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 4a3995c..8d30a1c 100755 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,12 +2,9 @@ - - + - - - + @@ -29,74 +26,21 @@ - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -110,7 +54,6 @@ @@ -205,6 +149,7 @@ + @@ -223,10 +168,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + - @@ -358,28 +348,29 @@ - + + - - + - - + + @@ -634,7 +625,6 @@ - @@ -662,22 +652,6 @@ - - - - - - - - - - - - - - - - @@ -697,5 +671,21 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Utils/Page.php b/src/Utils/PageUtil.php similarity index 90% rename from src/Utils/Page.php rename to src/Utils/PageUtil.php index 9ebd3bf..4916ffc 100755 --- a/src/Utils/Page.php +++ b/src/Utils/PageUtil.php @@ -8,12 +8,28 @@ * @author chenqionghe * @package libs\Utils */ -class Page +class PageUtil { - private $page = 1; - private $total = 1; - private $pageSize = 10; - private $gets = []; + /** + * 当前页码 + * @var int + */ + public $page = 1; + /** + * 总条数 + * @var int + */ + public $total = 1; + /** + * 每页显示条数 + * @var int + */ + public $pageSize = 10; + /** + * url的get参数集 + * @var array + */ + public $gets = []; /** * Page constructor. @@ -21,9 +37,11 @@ class Page * @param int $pageSize 每页显示条数 * @param int $page 当前页码 * @param array $gets url携带get参数数组 + * @return self */ - public function __construct($totalPage, $pageSize = 10, $page = 1, $gets = []) + public static function create($totalPage, $pageSize = 10, $page = 1, $gets = []) { + $p = new PageUtil(); if ($pageSize < 1) { $pageSize = 1; } @@ -36,10 +54,11 @@ public function __construct($totalPage, $pageSize = 10, $page = 1, $gets = []) $page = $total; } - $this->page = $page; - $this->gets = $gets; - $this->total = $total; - $this->pageSize = $pageSize; + $p->page = $page; + $p->gets = $gets; + $p->total = $total; + $p->pageSize = $pageSize; + return $p; } /** @@ -220,6 +239,4 @@ private static function getLimit($pageSize) { return $pageSize < 1 ? -1 : $pageSize; } - - } diff --git a/test/TestPage.php b/test/TestPage.php index 6ad6073..1f99e26 100644 --- a/test/TestPage.php +++ b/test/TestPage.php @@ -7,5 +7,5 @@ */ require __DIR__ . '/../src/autoload.php'; -$page = new \libs\Utils\Page(1, 10, 10, ['uid' => 3]); +$page = \libs\Utils\PageUtil::create(1, 10, 10, ['uid' => 3]); echo $page->getPagination('/index'); \ No newline at end of file