ulthon/ulthon_admin
1
0
Fork 0
mirror of https://gitee.com/ulthon/ulthon_admin.git synced 2026-07-01 15:32:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

新增time_limit查询；新增number_limit查询；新增同一个字段多个搜索项；

Browse Source
This commit is contained in:
augushong
2022-04-27 17:35:32 +08:00
parent 48ada69be8
commit 97c991e916
4 changed files with 252 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/common/controller/AdminController.php
View File

@@ -174,20 +174,19 @@ class AdminController extends BaseController
$message = array_merge($this->validateMessage, $message);
if(is_null($batch)){
if (is_null($batch)) {
$batch = $this->batchValidate;
}
if ($this->validateRule instanceof Validate) {
$this->validateRule->message($message);
// 是否批量验证
// 是否批量验证
if ($batch) {
$this->validateRule->batch(true);
}
$this->validateRule->failException(true)->check($data);
} else if (is_array($this->validateRule)) {
parent::validate($data, $this->validateRule, $message, $batch);
} else {
@@ -226,6 +225,13 @@ class AdminController extends BaseController
continue;
}
$op = isset($ops[$key]) && !empty($ops[$key]) ? $ops[$key] : '%*%';
if (strpos($key, '[') === 0) {
$key = str_replace('[', '', $key);
$key = explode(']', $key)[0];
}
if ($this->relationSearch && count(explode('.', $key)) == 1) {
$key = "{$tableName}.{$key}";
}
@@ -242,6 +248,18 @@ class AdminController extends BaseController
case '%*':
$where[] = [$key, 'LIKE', "%{$val}"];
break;
case 'min':
$where[] = [$key, '>=', $val];
break;
case 'max':
$where[] = [$key, '<=', $val];
break;
case 'min_date':
$where[] = [$key, '>=', strtotime($val)];
break;
case 'max_date':
$where[] = [$key, '<=', strtotime($val)];
break;
case 'range':
[$beginTime, $endTime] = explode(' - ', $val);
$where[] = [$key, '>=', strtotime($beginTime)];