优化tableData组件,修复动态字段,增加group重复验证

This commit is contained in:
2022-09-23 10:43:04 +08:00
parent a1df6a4b53
commit 409fe09573
4 changed files with 14 additions and 7 deletions

View File

@@ -24,14 +24,16 @@ trait Curd
if (input('selectFields')) {
return $this->selectList();
}
list($page, $limit, $where) = $this->buildTableParames();
list($page, $limit, $where, $excludes, $request_options, $group) = $this->buildTableParames();
$count = $this->model
->where($where)
->group($group)
->count();
$list = $this->model
->where($where)
->page($page, $limit)
->order($this->sort)
->group($group)
->select();
$data = [
'code' => 0,

View File

@@ -209,6 +209,7 @@ class AdminController extends BaseController
$get = $this->request->get('', null, null);
$page = isset($get['page']) && !empty($get['page']) ? $get['page'] : 1;
$limit = isset($get['limit']) && !empty($get['limit']) ? $get['limit'] : 15;
$group = isset($get['group']) && !empty($get['group']) ? $get['group'] : null;
$filters = isset($get['filter']) && !empty($get['filter']) ? $get['filter'] : '{}';
$ops = isset($get['op']) && !empty($get['op']) ? $get['op'] : '{}';
// json转数组
@@ -277,7 +278,7 @@ class AdminController extends BaseController
$where[] = [$key, $op, "%{$val}"];
}
}
return [$page, $limit, $where, $excludes, $request_options];
return [$page, $limit, $where, $excludes, $request_options, $group];
}
/**