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

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
library/think/Model.php
View File

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

4
library/traits/model/Auto.php
View File

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