HDK/hyperf-admin
1
0
Fork 0
mirror of http://124.126.16.154:8888/singularity/hyperf-admin.git synced 2026-01-15 03:35:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: support custom sort cloumn

Browse Source
This commit is contained in:
daodao97
2021-04-21 16:25:24 +08:00
parent 0798685e90
commit 5f1bdc834e
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/base-utils/src/Scaffold/Controller/AbstractController.php
View File

@@ -203,6 +203,9 @@ abstract class AbstractController extends Controller
} }
} }
$order_by = $this->options['order_by'] ?? ''; $order_by = $this->options['order_by'] ?? '';
if ($sortColumn = $this->request->input('_sort_column') && $sortType = $this->request->input('_sort_type')) {
$order_by = $sortColumn . ' ' . $sortType;
}
if (empty($conditions) && !($this->options['defaultList'] ?? true)) { if (empty($conditions) && !($this->options['defaultList'] ?? true)) {
return compact('page', 'size', 'conditions', 'order_by', 'columns', 'table_options'); return compact('page', 'size', 'conditions', 'order_by', 'columns', 'table_options');
} }