mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-01 12:42:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

自动验证支持 批量验证和 存在就验证 有值就验证

Browse Source
This commit is contained in:
thinkphp
2016-02-09 20:22:53 +08:00
parent efabc44164
commit b63bda78d7
1 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
library/think/Model.php
View File

@@ -948,8 +948,23 @@ class Model
} else {
$rules = $this->options['validate'];
}
if (isset($rules['__option__'])) {
// 验证参数设置
$options = $rules['__option__'];
unset($rules['__option__']);
} else {
$options = [];
}
$options['value_validate'] = isset($options['value_validate']) ? $options['value_validate'] : [];
$options['exists_validate'] = isset($options['exists_validate']) ? $options['exists_validate'] : [];
foreach ($rules as $key => $val) {
$value = isset($data[$key]) ? $data[$key] : null;
if (in_array($key, $options['value_validate']) && '' == $value) {
continue;
} elseif (in_array($key, $options['exists_validate']) && !isset($data[$key])) {
continue;
}
$result = true;
if ($val instanceof \Closure) {
// 匿名函数验证 支持传入当前字段和所有字段两个数据
$result = App::invokeFunction($val, [$value, $data]);
@@ -959,10 +974,19 @@ class Model
}
if (true !== $result) {
// 没有返回true 则表示验证失败
$this->error = $result;
return false;
if (!empty($options['patch'])) {
// 批量验证
$this->error[$key] = $result;
} else {
$this->error = $result;
return false;
}
}
}
// 批量验证的时候最后返回错误
if (!empty($this->error)) {
return false;
}
}
// 数据自动填充