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-22 14:07:41 +08:00
parent 3402a1a936
commit e9a06cdf67
2 changed files with 21 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -155,17 +155,17 @@ class Crud extends Base
*/
protected function doFormat($query, $format, $limit): Response
{
if (in_array($format, ['select', 'tree', 'table_tree'])) {
$items = $query->get();
if ($format == 'select') {
return $this->formatSelect($items);
} elseif ($format == 'tree') {
return $this->formatTree($items);
}
return $this->formatTableTree($items);
}
$methods = [
'select' => 'formatSelect',
'tree' => 'formatTree',
'table_tree' => 'formatTableTree',
'normal' => 'formatNormal',
];
$paginator = $query->paginate($limit);
return json(['code' => 0, 'msg' => 'ok', 'count' => $paginator->total(), 'data' => $paginator->items()]);
$total = $paginator->total();
$items = $paginator->items();
$format_function = $methods[$format] ?? 'formatNormal';
return call_user_func([$this, $format_function], $items, $total);
}
/**
@ -383,4 +383,15 @@ class Crud extends Base
return $this->json(0, 'ok', $formatted_items);
}
/**
* 通用格式化
* @param $items
* @param $total
* @return Response
*/
protected function formatNormal($items, $total): Response
{
return json(['code' => 0, 'msg' => 'ok', 'count' => $total, 'data' => $items]);
}
}

22
src/plugin/admin/app/controller/RoleController.php
View File

@ -57,28 +57,6 @@ class RoleController extends Crud
return $this->doFormat($query, $format, $limit);
}
/**
* 格式化数据
* @param $query
* @param $format
* @param $limit
* @return Response
*/
protected function doFormat($query, $format, $limit): Response
{
if (in_array($format, ['select', 'tree', 'table_tree'])) {
$items = $query->get();
if ($format == 'select') {
return $this->formatSelect($items);
} elseif ($format == 'tree') {
return $this->formatTree($items);
}
return $this->formatTableTree($items);
}
$paginator = $query->paginate($limit);
return json(['code' => 0, 'msg' => 'ok', 'count' => $paginator->total(), 'data' => $paginator->items()]);
}
/**
* 插入
* @param Request $request