Skip to content

feat: 全部列表页支持服务端列头排序 #466

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
TomyJan wants to merge 1 commit into from
Closed

feat: 全部列表页支持服务端列头排序 #466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 36 additions & 4 deletions app/controller/Cert.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,21 @@ public function account_data()
$kw = $this->request->post('kw', null, 'trim');
$offset = input('post.offset/d');
$limit = input('post.limit/d');
$sort = input('post.sortName', null, 'trim');
$orderDir = strtolower(input('post.sortOrder', 'desc')) === 'asc' ? 'asc' : 'desc';

$select = Db::name('cert_account')->where('deploy', $deploy);
if (!empty($kw)) {
$select->whereLike('name|remark', '%' . $kw . '%')->whereOr('id', $kw);
}
$total = $select->count();
$rows = $select->order('id', 'desc')->limit($offset, $limit)->select();
$allowedSort = ['id' => 'id', 'typename' => 'type', 'name' => 'name', 'remark' => 'remark', 'addtime' => 'addtime'];
if ($sort && isset($allowedSort[$sort])) {
$select->order($allowedSort[$sort], $orderDir);
} else {
$select->order('id', 'desc');
}
$rows = $select->limit($offset, $limit)->select();

$list = [];
foreach ($rows as $row) {
Expand Down Expand Up @@ -216,6 +224,8 @@ public function order_data()
$status = input('post.status', null, 'trim');
$offset = input('post.offset/d');
$limit = input('post.limit/d');
$sort = input('post.sortName', null, 'trim');
$orderDir = strtolower(input('post.sortOrder', 'desc')) === 'asc' ? 'asc' : 'desc';

$select = Db::name('cert_order')->alias('A')->leftJoin('cert_account B', 'A.aid = B.id');
if (!empty($id)) {
Expand All @@ -242,7 +252,13 @@ public function order_data()
}
}
$total = $select->count();
$rows = $select->fieldRaw('A.*,B.type,B.remark aremark')->order('id', 'desc')->limit($offset, $limit)->select();
$allowedSort = ['id' => 'A.id', 'typename' => 'B.type', 'keytype' => 'A.keytype', 'isauto' => 'A.isauto', 'issuetime' => 'A.issuetime', 'end_day' => 'A.expiretime', 'status' => 'A.status'];
if ($sort && isset($allowedSort[$sort])) {
$select->order($allowedSort[$sort], $orderDir);
} else {
$select->order('A.id', 'desc');
}
$rows = $select->fieldRaw('A.*,B.type,B.remark aremark')->limit($offset, $limit)->select();

$list = [];
foreach ($rows as $row) {
Expand Down Expand Up @@ -650,6 +666,8 @@ public function deploy_data()
$remark = input('post.remark', null, 'trim');
$offset = input('post.offset/d');
$limit = input('post.limit/d');
$sort = input('post.sortName', null, 'trim');
$orderDir = strtolower(input('post.sortOrder', 'desc')) === 'asc' ? 'asc' : 'desc';

$select = Db::name('cert_deploy')->alias('A')->leftJoin('cert_account B', 'A.aid = B.id')->leftJoin('cert_order C', 'A.oid = C.id')->leftJoin('cert_account D', 'C.aid = D.id');
if (!empty($oid)) {
Expand All @@ -671,7 +689,13 @@ public function deploy_data()
$select->where('A.remark', $remark);
}
$total = $select->count();
$rows = $select->fieldRaw('A.*,B.type,B.remark aremark,B.name aname,D.type certtype,D.id certaid')->order('id', 'desc')->limit($offset, $limit)->select();
$allowedSort = ['id' => 'A.id', 'typename' => 'B.type', 'remark' => 'A.remark', 'active' => 'A.active', 'lasttime' => 'A.lasttime', 'status' => 'A.status'];
if ($sort && isset($allowedSort[$sort])) {
$select->order($allowedSort[$sort], $orderDir);
} else {
$select->order('A.id', 'desc');
}
$rows = $select->fieldRaw('A.*,B.type,B.remark aremark,B.name aname,D.type certtype,D.id certaid')->limit($offset, $limit)->select();

$list = [];
foreach ($rows as $row) {
Expand Down Expand Up @@ -862,13 +886,21 @@ public function cname_data()
$kw = $this->request->post('kw', null, 'trim');
$offset = input('post.offset/d');
$limit = input('post.limit/d');
$sort = input('post.sortName', null, 'trim');
$orderDir = strtolower(input('post.sortOrder', 'desc')) === 'asc' ? 'asc' : 'desc';

$select = Db::name('cert_cname')->alias('A')->leftJoin('domain B', 'A.did = B.id');
if (!empty($kw)) {
$select->whereLike('A.domain', '%' . $kw . '%');
}
$total = $select->count();
$rows = $select->order('A.id', 'desc')->limit($offset, $limit)->field('A.*,B.name cnamedomain')->select();
$allowedSort = ['id' => 'A.id', 'domain' => 'A.domain', 'status' => 'A.status', 'addtime' => 'A.addtime'];
if ($sort && isset($allowedSort[$sort])) {
$select->order($allowedSort[$sort], $orderDir);
} else {
$select->order('A.id', 'desc');
}
$rows = $select->limit($offset, $limit)->field('A.*,B.name cnamedomain')->select();

$list = [];
foreach ($rows as $row) {
Expand Down
20 changes: 18 additions & 2 deletions app/controller/Dmonitor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ public function task_data()
$kw = input('post.kw', null, 'trim');
$offset = input('post.offset/d');
$limit = input('post.limit/d');
$sort = input('post.sortName', null, 'trim');
$orderDir = strtolower(input('post.sortOrder', 'desc')) === 'asc' ? 'asc' : 'desc';

$select = Db::name('dmtask')->alias('A')->join('domain B', 'A.did = B.id');
if (!empty($kw)) {
Expand All @@ -62,7 +64,13 @@ public function task_data()
$select->where('status', intval($status));
}
$total = $select->count();
$list = $select->order('A.id', 'desc')->limit($offset, $limit)->field('A.*,B.name domain')->select()->toArray();
$allowedSort = ['id' => 'A.id', 'rr' => 'A.rr', 'main_value' => 'A.main_value', 'type' => 'A.type', 'checktype' => 'A.checktype', 'frequency' => 'A.frequency', 'status' => 'A.status', 'active' => 'A.active', 'checktimestr' => 'A.checktime', 'addtimestr' => 'A.addtime', 'remark' => 'A.remark'];
if ($sort && isset($allowedSort[$sort])) {
$select->order($allowedSort[$sort], $orderDir);
} else {
$select->order('A.id', 'desc');
}
$list = $select->limit($offset, $limit)->field('A.*,B.name domain')->select()->toArray();

foreach ($list as &$row) {
$row['addtimestr'] = date('Y-m-d H:i:s', $row['addtime']);
Expand Down Expand Up @@ -234,13 +242,21 @@ public function tasklog_data()
$offset = input('post.offset/d');
$limit = input('post.limit/d');
$action = input('post.action/d', 0);
$sort = input('post.sortName', null, 'trim');
$orderDir = strtolower(input('post.sortOrder', 'desc')) === 'asc' ? 'asc' : 'desc';

$select = Db::name('dmlog')->where('taskid', $taskid);
if ($action > 0) {
$select->where('action', $action);
}
$total = $select->count();
$list = $select->order('id', 'desc')->limit($offset, $limit)->select();
$allowedSort = ['id' => 'id', 'action' => 'action', 'date' => 'date', 'errmsg' => 'errmsg'];
if ($sort && isset($allowedSort[$sort])) {
$select->order($allowedSort[$sort], $orderDir);
} else {
$select->order('id', 'desc');
}
$list = $select->limit($offset, $limit)->select();

return json(['total' => $total, 'rows' => $list]);
}
Expand Down
43 changes: 25 additions & 18 deletions app/controller/Domain.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,21 @@ public function account_data()
$kw = $this->request->post('kw', null, 'trim');
$offset = input('post.offset/d');
$limit = input('post.limit/d');
$sort = input('post.sortName', null, 'trim');
$orderDir = strtolower(input('post.sortOrder', 'desc')) === 'asc' ? 'asc' : 'desc';

$select = Db::name('account');
if (!empty($kw)) {
$select->whereLike('name|remark', '%' . $kw . '%');
}
$total = $select->count();
$rows = $select->order('id', 'desc')->limit($offset, $limit)->select();
$allowedSort = ['id' => 'id', 'typename' => 'type', 'name' => 'name', 'remark' => 'remark', 'addtime' => 'addtime'];
if ($sort && isset($allowedSort[$sort])) {
$select->order($allowedSort[$sort], $orderDir);
} else {
$select->order('id', 'desc');
}
$rows = $select->limit($offset, $limit)->select();

$list = [];
foreach ($rows as $row) {
Expand Down Expand Up @@ -192,7 +200,8 @@ public function domain_data()
$type = input('post.type', null, 'trim');
$status = input('post.status', null, 'trim');
$cid = input('post.cid', null, 'trim');
$order = input('post.order', null, 'trim');
$sort = input('post.sortName', null, 'trim');
$orderDir = strtolower(input('post.sortOrder', 'desc')) === 'asc' ? 'asc' : 'desc';
$offset = input('post.offset/d', 0);
$limit = input('post.limit/d', 10);
$id = input('post.id');
Expand Down Expand Up @@ -224,21 +233,11 @@ public function domain_data()
}
}
$total = $select->count();
switch ($order) {
case '1':
$select->order('A.regtime', 'asc');
break;
case '2':
$select->order('A.regtime', 'desc');
break;
case '3':
$select->order('A.expiretime', 'asc');
break;
case '4':
$select->order('A.expiretime', 'desc');
break;
default:
$select->order('A.id', 'desc');
$allowedSort = ['id' => 'A.id', 'name' => 'A.name', 'recordcount' => 'A.recordcount', 'addtime' => 'A.addtime', 'regtime' => 'A.regtime', 'expiretime' => 'A.expiretime', 'is_notice' => 'A.is_notice', 'is_hide' => 'A.is_hide', 'is_sso' => 'A.is_sso', 'typename' => 'B.type', 'category_name' => 'A.cid', 'remark' => 'A.remark'];
if ($sort && isset($allowedSort[$sort])) {
$select->order($allowedSort[$sort], $orderDir);
} else {
$select->order('A.id', 'desc');
}
$rows = $select->fieldRaw('A.*,B.type,B.remark aremark')->limit($offset, $limit)->select();

Expand Down Expand Up @@ -1392,10 +1391,18 @@ public function category_data()
if (!checkPermission(2)) return json(['total' => 0, 'rows' => []]);
$offset = input('post.offset/d', 0);
$limit = input('post.limit/d', 10);
$sort = input('post.sortName', null, 'trim');
$orderDir = strtolower(input('post.sortOrder', 'desc')) === 'asc' ? 'asc' : 'desc';

$select = Db::name('domain_category');
$total = $select->count();
$rows = $select->order('sort', 'asc')->order('id', 'desc')->limit($offset, $limit)->select()->toArray();
$allowedSort = ['id' => 'id', 'name' => 'name', 'remark' => 'remark', 'sort' => 'sort', 'addtime' => 'addtime'];
if ($sort && isset($allowedSort[$sort])) {
$select->order($allowedSort[$sort], $orderDir);
} else {
$select->order('id', 'desc');
}
$rows = $select->limit($offset, $limit)->select()->toArray();

foreach ($rows as &$row) {
$row['domain_count'] = Db::name('domain')->where('cid', $row['id'])->count();
Expand Down
10 changes: 9 additions & 1 deletion app/controller/Optimizeip.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ public function opiplist_data()
$status = input('post.status', null);
$offset = input('post.offset/d');
$limit = input('post.limit/d');
$sort = input('post.sortName', null, 'trim');
$orderDir = strtolower(input('post.sortOrder', 'desc')) === 'asc' ? 'asc' : 'desc';

$select = Db::name('optimizeip')->alias('A')->join('domain B', 'A.did = B.id');
if (!empty($kw)) {
Expand All @@ -58,7 +60,13 @@ public function opiplist_data()
$select->where('status', intval($status));
}
$total = $select->count();
$list = $select->order('A.id', 'desc')->limit($offset, $limit)->field('A.*,B.name domain')->select();
$allowedSort = ['id' => 'A.id', 'rr' => 'A.rr', 'cdn_type' => 'A.cdn_type', 'recordnum' => 'A.recordnum', 'ip_type' => 'A.ip_type', 'active' => 'A.active', 'updatetime' => 'A.updatetime', 'status' => 'A.status'];
if ($sort && isset($allowedSort[$sort])) {
$select->order($allowedSort[$sort], $orderDir);
} else {
$select->order('A.id', 'desc');
}
$list = $select->limit($offset, $limit)->field('A.*,B.name domain')->select();

return json(['total' => $total, 'rows' => $list]);
}
Expand Down
10 changes: 9 additions & 1 deletion app/controller/Schedule.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ public function stask_data()
$stype = input('post.stype', null);
$offset = input('post.offset/d');
$limit = input('post.limit/d');
$sort = input('post.sortName', null, 'trim');
$orderDir = strtolower(input('post.sortOrder', 'desc')) === 'asc' ? 'asc' : 'desc';

$select = Db::name('sctask')->alias('A')->join('domain B', 'A.did = B.id');
if (!empty($kw)) {
Expand All @@ -41,7 +43,13 @@ public function stask_data()
$select->where('type', $stype);
}
$total = $select->count();
$list = $select->order('A.id', 'desc')->limit($offset, $limit)->field('A.*,B.name domain')->select()->toArray();
$allowedSort = ['id' => 'A.id', 'rr' => 'A.rr', 'type' => 'A.type', 'switchtype' => 'A.switchtype', 'active' => 'A.active', 'updatetimestr' => 'A.updatetime', 'nexttimestr' => 'A.nexttime', 'addtimestr' => 'A.addtime', 'remark' => 'A.remark'];
if ($sort && isset($allowedSort[$sort])) {
$select->order($allowedSort[$sort], $orderDir);
} else {
$select->order('A.id', 'desc');
}
$list = $select->limit($offset, $limit)->field('A.*,B.name domain')->select()->toArray();

foreach ($list as &$row) {
$row['addtimestr'] = date('Y-m-d H:i:s', $row['addtime']);
Expand Down
20 changes: 18 additions & 2 deletions app/controller/User.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,21 @@ public function user_data()
$kw = input('post.kw', null, 'trim');
$offset = input('post.offset/d');
$limit = input('post.limit/d');
$sort = input('post.sortName', null, 'trim');
$orderDir = strtolower(input('post.sortOrder', 'desc')) === 'asc' ? 'asc' : 'desc';

$select = Db::name('user');
if (!empty($kw)) {
$select->whereLike('id|username', $kw);
}
$total = $select->count();
$rows = $select->order('id', 'desc')->limit($offset, $limit)->select();
$allowedSort = ['id' => 'id', 'username' => 'username', 'level' => 'level', 'is_api' => 'is_api', 'regtime' => 'regtime', 'lasttime' => 'lasttime', 'status' => 'status'];
if ($sort && isset($allowedSort[$sort])) {
$select->order($allowedSort[$sort], $orderDir);
} else {
$select->order('id', 'desc');
}
$rows = $select->limit($offset, $limit)->select();

return json(['total' => $total, 'rows' => $rows]);
}
Expand Down Expand Up @@ -165,6 +173,8 @@ public function log_data()
$domain = input('post.domain', null, 'trim');
$offset = input('post.offset/d');
$limit = input('post.limit/d');
$sort = input('post.sortName', null, 'trim');
$orderDir = strtolower(input('post.sortOrder', 'desc')) === 'asc' ? 'asc' : 'desc';

$select = Db::name('log');
if ($this->request->user['type'] == 'domain') {
Expand All @@ -181,7 +191,13 @@ public function log_data()
$select->where('domain', $domain);
}
$total = $select->count();
$rows = $select->order('id', 'desc')->limit($offset, $limit)->select();
$allowedSort = ['id' => 'id', 'uid' => 'uid', 'domain' => 'domain', 'action' => 'action', 'data' => 'data', 'addtime' => 'addtime'];
if ($sort && isset($allowedSort[$sort])) {
$select->order($allowedSort[$sort], $orderDir);
} else {
$select->order('id', 'desc');
}
$rows = $select->limit($offset, $limit)->select();

return json(['total' => $total, 'rows' => $rows]);
}
Expand Down
43 changes: 39 additions & 4 deletions app/view/cert/certaccount.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,35 +34,70 @@
const defaultPageSize = 15;
const pageNumber = typeof window.$_GET['pageNumber'] != 'undefined' ? parseInt(window.$_GET['pageNumber']) : 1;
const pageSize = typeof window.$_GET['pageSize'] != 'undefined' ? parseInt(window.$_GET['pageSize']) : defaultPageSize;
var urlSort = typeof window.$_GET['sortName'] != 'undefined' ? window.$_GET['sortName'] : undefined;
var urlOrder = typeof window.$_GET['sortOrder'] != 'undefined' ? window.$_GET['sortOrder'] : undefined;

$("#listTable").bootstrapTable({
url: '/cert/account/data?deploy=0',
pageNumber: pageNumber,
pageSize: pageSize,
classes: 'table table-striped table-hover table-bordered',
sortReset: false,
sortName: urlSort,
sortOrder: urlOrder,
onSort: function(name, order) {
var $table = $('#listTable');
if (!name) {
$table.data('_sortClicks', null);
return;
}
var clicks = $table.data('_sortClicks') || {};
if (clicks._last !== name) {
clicks = {_last: name};
clicks[name] = 1;
this.sortOrder = 'desc';
} else {
clicks[name] = (clicks[name] || 0) + 1;
if (clicks[name] === 1) {
this.sortOrder = 'desc';
} else if (clicks[name] === 2) {
this.sortOrder = 'asc';
} else {
this.sortName = undefined;
this.sortOrder = undefined;
clicks = {};
}
}
$table.data('_sortClicks', clicks);
},
columns: [
{
field: 'id',
title: 'ID'
title: 'ID',
sortable: true
},
{
field: 'typename',
title: '所属平台',
sortable: true,
formatter: function(value, row, index) {
return '<img src="/static/images/'+row.icon+'" class="type-logo"></img>'+value;
}
},
{
field: 'name',
title: '账户名称'
title: '账户名称',
sortable: true
},
{
field: 'remark',
title: '备注'
title: '备注',
sortable: true
},
{
field: 'addtime',
title: '添加时间'
title: '添加时间',
sortable: true
},
{
field: 'action',
Expand Down
Loading