0b2/catchAdmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed:数据字典分页查询

Browse Source
This commit is contained in:
JaguarJack 2020-09-12 11:11:59 +08:00
parent 9e13a9c937
commit dc4855f5c1
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
catch/system/controller/DataDictionary.php
View File

@ -7,7 +7,6 @@ use catcher\CatchResponse;
use catcher\exceptions\FailedException; use catcher\exceptions\FailedException;
use catcher\library\BackUpDatabase; use catcher\library\BackUpDatabase;
use think\Collection; use think\Collection;
use think\facade\Console;
use think\facade\Db; use think\facade\Db;
use think\Paginator; use think\Paginator;
@ -24,7 +23,7 @@ class DataDictionary extends CatchController
$tables = Db::query('show table status'); $tables = Db::query('show table status');
// 重组数据 // 重组数据
foreach ($tables as $key => &$table) { foreach ($tables as &$table) {
$table = array_change_key_case($table); $table = array_change_key_case($table);
$table['index_length'] = $table['index_length'] > 1024 ? intval($table['index_length']/1024) .'MB' : $table['index_length'].'KB'; $table['index_length'] = $table['index_length'] > 1024 ? intval($table['index_length']/1024) .'MB' : $table['index_length'].'KB';
$table['data_length'] = $table['data_length'] > 1024 ? intval($table['data_length']/1024) .'MB' : $table['data_length'].'KB'; $table['data_length'] = $table['data_length'] > 1024 ? intval($table['data_length']/1024) .'MB' : $table['data_length'].'KB';
@ -41,8 +40,7 @@ class DataDictionary extends CatchController
if ($engine = $request->get('engine', null)) { if ($engine = $request->get('engine', null)) {
$tables = $tables->where('engine', $engine)->values(); $tables = $tables->where('engine', $engine)->values();
} }
$page = $request->get('page', 1) ? : 1;
$page = $request->get('page', 1);
$limit = $request->get('limit', 10); $limit = $request->get('limit', 10);
return CatchResponse::paginate(Paginator::make(array_slice($tables->toArray(), ($page - 1) * $limit, $limit), $limit, $page, $tables->count(), false, [])); return CatchResponse::paginate(Paginator::make(array_slice($tables->toArray(), ($page - 1) * $limit, $limit), $limit, $page, $tables->count(), false, []));