mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-05 22:52:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

改进自动验证的规则场景定义

Browse Source
This commit is contained in:
thinkphp
2016-02-15 12:46:58 +08:00
parent 7f48193dcb
commit 3a62a49585
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
library/think/Model.php
View File

@@ -981,7 +981,12 @@ class Model
// 全局字段规则 // 全局字段规则
$this->rule = $validate['__pattern__']; $this->rule = $validate['__pattern__'];
} }
$rules = $validate[$this->options['validate']]; if (strpos($this->options['validate'], '.')) {
list($name, $group) = explode('.', $this->options['validate']);
} else {
$name = $this->options['validate'];
}
$rules = $validate[$name];
if (isset($validate['__all__'])) { if (isset($validate['__all__'])) {
$rules = array_merge($validate['__all__'], $rules); $rules = array_merge($validate['__all__'], $rules);
} }
@@ -995,9 +1000,19 @@ class Model
} else { } else {
$options = []; $options = [];
} }
if (isset($group) && isset($options['on'][$group])) {
// 如果设置了验证适用场景
$scene = $options['on'][$group];
if (is_string($scene)) {
$scene = explode(',', $scene);
}
}
$options['value_validate'] = isset($options['value_validate']) ? $options['value_validate'] : []; $options['value_validate'] = isset($options['value_validate']) ? $options['value_validate'] : [];
$options['exists_validate'] = isset($options['exists_validate']) ? $options['exists_validate'] : []; $options['exists_validate'] = isset($options['exists_validate']) ? $options['exists_validate'] : [];
foreach ($rules as $key => $val) { foreach ($rules as $key => $val) {
if (isset($scene) && !in_array($key, $scene)) {
continue;
}
$value = isset($data[$key]) ? $data[$key] : null; $value = isset($data[$key]) ? $data[$key] : null;
if (in_array($key, $options['value_validate']) && '' == $value) { if (in_array($key, $options['value_validate']) && '' == $value) {
continue; continue;