|
|
@@ -23,7 +23,10 @@ class Request extends \think\Request
|
|
|
public function pageAndLimit(): array
|
|
|
{
|
|
|
$page = $this->get('page/d', 1);
|
|
|
- $limit = $this->get('limit/d', $this->get('per_page/d', 10));
|
|
|
+ $limit = (int) collect(['limit', 'per_page', 'list_rows'])
|
|
|
+ ->map(fn (string $key) => $this->get($key))
|
|
|
+ ->filter(fn (mixed $v) => $v !== null && $v !== '')
|
|
|
+ ->first(default: 10);
|
|
|
$page = max($page, 1);
|
|
|
$limit = min($limit, 1000);
|
|
|
return ['page' => $page, 'list_rows' => $limit];
|