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

model类的validate和auto方法支持自动读取以当前模型名称命名的规则

Browse Source
This commit is contained in:
thinkphp
2016-02-19 22:58:04 +08:00
parent c3e86347f5
commit 6508185312
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
library/think/Model.php
View File

@@ -1093,30 +1093,30 @@ class Model
/** /**
* 获取数据自动验证或者完成的规则定义 * 获取数据自动验证或者完成的规则定义
* @access protected * @access protected
* @param array $data 数据 * @param mixed $rules 数据规则
* @param string $type 数据类型 支持 validate auto * @param string $type 数据类型 支持 validate auto
* @return array * @return array
*/ */
protected function getDataRule($data, $type) protected function getDataRule($rules, $type)
{ {
if (is_string($data)) { if (!is_array($rules)) {
// 读取配置文件中的自动验证定义 // 读取配置文件中的数据类型定义
$config = Config::get($type); $config = Config::get($type);
if ('validate' == $type && isset($config['__pattern__'])) { if ('validate' == $type && isset($config['__pattern__'])) {
// 全局字段规则 // 全局字段规则
$this->rule = $config['__pattern__']; $this->rule = $config['__pattern__'];
} }
if (strpos($data, '.')) { if (true === $rules) {
list($name, $group) = explode('.', $data); $name = strtolower($this->name);
} elseif (strpos($rules, '.')) {
list($name, $group) = explode('.', $rules);
} else { } else {
$name = $data; $name = $rules;
} }
$rules = $config[$name]; $rules = $config[$name];
if (isset($config['__all__'])) { if (isset($config['__all__'])) {
$rules = array_merge($config['__all__'], $rules); $rules = array_merge($config['__all__'], $rules);
} }
} else {
$rules = $data;
} }
if (isset($rules['__option__'])) { if (isset($rules['__option__'])) {
// 参数设置 // 参数设置
@@ -1980,11 +1980,11 @@ class Model
/** /**
* 设置字段验证 * 设置字段验证
* @access public * @access public
* @param mixed $field 字段名或者验证规则 * @param mixed $field 字段名或者验证规则 true表示自动读取
* @param array|null $rule 验证规则 * @param array|null $rule 验证规则
* @return Model * @return Model
*/ */
public function validate($field, $rule = null) public function validate($field = true, $rule = null)
{ {
if (is_array($field) || is_null($rule)) { if (is_array($field) || is_null($rule)) {
$this->options['validate'] = $field; $this->options['validate'] = $field;
@@ -1997,11 +1997,11 @@ class Model
/** /**
* 设置字段完成 * 设置字段完成
* @access public * @access public
* @param mixed $field 字段名或者自动完成规则 * @param mixed $field 字段名或者自动完成规则 true 表示自动读取
* @param array|null $rule 完成规则 * @param array|null $rule 完成规则
* @return Model * @return Model
*/ */
public function auto($field, $rule = null) public function auto($field = true, $rule = null)
{ {
if (is_array($field) || is_null($rule)) { if (is_array($field) || is_null($rule)) {
$this->options['auto'] = $field; $this->options['auto'] = $field;