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

改进验证规则和完成规则 支持同一个字段的多次验证和完成

Browse Source
This commit is contained in:
thinkphp
2016-02-18 17:39:52 +08:00
parent 98c94a1317
commit 2fcf0b3ee4
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
library/think/Model.php
View File

@@ -996,6 +996,9 @@ class Model
$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 (is_numeric($key)) {
$key = array_shift($val);
}
if (!empty($scene) && !in_array($key, $scene)) { if (!empty($scene) && !in_array($key, $scene)) {
continue; continue;
} }
@@ -1048,6 +1051,9 @@ class Model
$options['value_fill'] = isset($options['value_fill']) ? $options['value_fill'] : []; $options['value_fill'] = isset($options['value_fill']) ? $options['value_fill'] : [];
$options['exists_fill'] = isset($options['exists_fill']) ? $options['exists_fill'] : []; $options['exists_fill'] = isset($options['exists_fill']) ? $options['exists_fill'] : [];
foreach ($rules as $key => $val) { foreach ($rules as $key => $val) {
if (is_numeric($key)) {
$key = array_shift($val);
}
if (!empty($scene) && !in_array($key, $scene)) { if (!empty($scene) && !in_array($key, $scene)) {
continue; continue;
} }