heibai2006/webman_admin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

save

Browse Source
This commit is contained in:
walkor 2022-12-10 21:48:31 +08:00
parent 471c6770c5
commit 5cefdb2797
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugin/admin/app/controller/Crud.php
View File

@ -26,9 +26,9 @@ class Crud extends Base
*/ */
public function select(Request $request): Response public function select(Request $request): Response
{ {
[$where, $format, $page_size, $field, $order] = $this->selectInput($request); [$where, $format, $limit, $field, $order] = $this->selectInput($request);
$query = $this->doSelect($where, $field, $order); $query = $this->doSelect($where, $field, $order);
return $this->doFormat($query, $format, $page_size); return $this->doFormat($query, $format, $limit);
} }
/** /**
@ -98,7 +98,7 @@ class Crud extends Base
$field = $request->get('field'); $field = $request->get('field');
$order = $request->get('order', 'asc'); $order = $request->get('order', 'asc');
$format = $request->get('format', 'normal'); $format = $request->get('format', 'normal');
$page_size = $request->get('limit', $format === 'tree' ? 1000 : 10); $limit = $request->get('limit', $format === 'tree' ? 1000 : 10);
$order = $order === 'asc' ? 'asc' : 'desc'; $order = $order === 'asc' ? 'asc' : 'desc';
$where = $request->get(); $where = $request->get();
$table = $this->model->getTable(); $table = $this->model->getTable();
@ -122,7 +122,7 @@ class Crud extends Base
$where[$this->dataLimitField] = admin_id(); $where[$this->dataLimitField] = admin_id();
} }
return [$where, $format, $page_size, $field, $order]; return [$where, $format, $limit, $field, $order];
} }
/** /**
@ -157,10 +157,10 @@ class Crud extends Base
/** /**
* @param $query * @param $query
* @param $format * @param $format
* @param $page_size * @param $limit
* @return Response * @return Response
*/ */
protected function doFormat($query, $format, $page_size): Response protected function doFormat($query, $format, $limit): Response
{ {
if (in_array($format, ['select', 'tree', 'table_tree'])) { if (in_array($format, ['select', 'tree', 'table_tree'])) {
$items = $query->get(); $items = $query->get();
@ -171,7 +171,7 @@ class Crud extends Base
} }
return $this->formatTableTree($items); return $this->formatTableTree($items);
} }
$paginator = $query->paginate($page_size); $paginator = $query->paginate($limit);
return json(['code' => 0, 'msg' => 'ok', 'count' => $paginator->total(), 'data' => $paginator->items()]); return json(['code' => 0, 'msg' => 'ok', 'count' => $paginator->total(), 'data' => $paginator->items()]);
} }

4
src/plugin/admin/app/controller/RuleController.php
View File

@ -187,7 +187,7 @@ class RuleController extends Crud
*/ */
protected function selectInput(Request $request): array protected function selectInput(Request $request): array
{ {
[$where, $format, $page_size, $field, $order] = parent::selectInput($request); [$where, $format, $limit, $field, $order] = parent::selectInput($request);
// 允许通过type=0,1格式传递菜单类型 // 允许通过type=0,1格式传递菜单类型
$types = $request->get('type'); $types = $request->get('type');
if ($types && is_string($types)) { if ($types && is_string($types)) {
@ -198,7 +198,7 @@ class RuleController extends Crud
$field = 'weight'; $field = 'weight';
$order = 'desc'; $order = 'desc';
} }
return [$where, $format, $page_size, $field, $order]; return [$where, $format, $limit, $field, $order];
} }
/** /**

4
src/plugin/admin/app/controller/TableController.php
View File

@ -1142,7 +1142,7 @@ EOF;
$order = $request->get('order', 'asc'); $order = $request->get('order', 'asc');
$table = Util::filterAlphaNum($request->get('table', '')); $table = Util::filterAlphaNum($request->get('table', ''));
$format = $request->get('format', 'normal'); $format = $request->get('format', 'normal');
$page_size = $request->get('limit', $format === 'tree' ? 5000 : 10); $limit = $request->get('limit', $format === 'tree' ? 5000 : 10);
$allow_column = Util::db()->select("desc $table"); $allow_column = Util::db()->select("desc $table");
if (!$allow_column) { if (!$allow_column) {
@ -1169,7 +1169,7 @@ EOF;
} }
} }
} }
$paginator = $paginator->orderBy($field, $order)->paginate($page_size, '*', 'page', $page); $paginator = $paginator->orderBy($field, $order)->paginate($limit, '*', 'page', $page);
$items = $paginator->items(); $items = $paginator->items();
if ($format == 'tree') { if ($format == 'tree') {

4
src/plugin/admin/app/controller/UploadController.php
View File

@ -62,7 +62,7 @@ class UploadController extends Crud
*/ */
public function select(Request $request): Response public function select(Request $request): Response
{ {
[$where, $format, $page_size, $field, $order] = $this->selectInput($request); [$where, $format, $limit, $field, $order] = $this->selectInput($request);
if (!empty($where['ext']) && is_string($where['ext'])) { if (!empty($where['ext']) && is_string($where['ext'])) {
$where['ext'] = ['in', explode(',', $where['ext'])]; $where['ext'] = ['in', explode(',', $where['ext'])];
} }
@ -70,7 +70,7 @@ class UploadController extends Crud
$where['name'] = ['like', "%{$where['name']}%"]; $where['name'] = ['like', "%{$where['name']}%"];
} }
$query = $this->doSelect($where, $field, $order); $query = $this->doSelect($where, $field, $order);
return $this->doFormat($query, $format, $page_size); return $this->doFormat($query, $format, $limit);
} }
/** /**