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

Validate类架构方法增加field参数 用于设置验证字段的描述

Browse Source
This commit is contained in:
thinkphp
2016-11-29 16:00:23 +08:00
parent aed8be7150
commit 8b80794b39
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
library/think/Validate.php
View File

@@ -34,6 +34,8 @@ class Validate
// 验证提示信息 // 验证提示信息
protected $message = []; protected $message = [];
// 验证字段描述
protected $field = [];
// 验证规则默认提示信息 // 验证规则默认提示信息
protected static $typeMsg = [ protected static $typeMsg = [
@@ -107,11 +109,13 @@ class Validate
* @access public * @access public
* @param array $rules 验证规则 * @param array $rules 验证规则
* @param array $message 验证提示信息 * @param array $message 验证提示信息
* @param array $field 验证字段描述信息
*/ */
public function __construct(array $rules = [], $message = []) public function __construct(array $rules = [], $message = [], $field = [])
{ {
$this->rule = array_merge($this->rule, $rules); $this->rule = array_merge($this->rule, $rules);
$this->message = array_merge($this->message, $message); $this->message = array_merge($this->message, $message);
$this->field = $field;
} }
/** /**
@@ -119,12 +123,13 @@ class Validate
* @access public * @access public
* @param array $rules 验证规则 * @param array $rules 验证规则
* @param array $message 验证提示信息 * @param array $message 验证提示信息
* @param array $field 验证字段描述信息
* @return Validate * @return Validate
*/ */
public static function make($rules = [], $message = []) public static function make($rules = [], $message = [], $field = [])
{ {
if (is_null(self::$instance)) { if (is_null(self::$instance)) {
self::$instance = new self($rules, $message); self::$instance = new self($rules, $message, $field);
} }
return self::$instance; return self::$instance;
} }
@@ -291,7 +296,7 @@ class Validate
// 字段|描述 用于指定属性名称 // 字段|描述 用于指定属性名称
list($key, $title) = explode('|', $key); list($key, $title) = explode('|', $key);
} else { } else {
$title = $key; $title = isset($this->field[$key]) ? $this->field[$key] : $key;
} }
// 场景检测 // 场景检测