\traits\model\Auto 用于升级兼容原有模型的自动验证和自动完成用法

This commit is contained in:
thinkphp
2016-02-20 09:05:38 +08:00
parent 6508185312
commit eae50abb78
2 changed files with 31 additions and 29 deletions

View File

@@ -1162,6 +1162,8 @@ class Model
$result = call_user_func_array($val, [$value, &$data]);
} elseif (isset($val[0]) && $val[0] instanceof \Closure) {
$result = call_user_func_array($val[0], [$value, &$data]);
} elseif (!is_array($val)) {
$result = $val;
} else {
$rule = isset($val[0]) ? $val[0] : $val;
$type = isset($val[1]) ? $val[1] : 'value';

View File

@@ -471,7 +471,7 @@ trait Auto
* @param array $auto 自动完成设置
* @return Auto
*/
public function auto($auto)
public function auto($auto, $rule = null)
{
$this->options['auto'] = $auto;
return $this;
@@ -483,7 +483,7 @@ trait Auto
* @param array $validate 自动验证设置
* @return Auto
*/
public function validate($validate)
public function validate($validate, $rule = null)
{
$this->options['validate'] = $validate;
return $this;