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

验证字段比较支持对比其他字段

Browse Source
This commit is contained in:
lilwil
2017-03-20 13:13:22 +08:00
parent ca1731f705
commit f6a8a2804f
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
library/think/Validate.php
View File

@@ -456,11 +456,12 @@ class Validate
* @access protected
* @param mixed $value 字段值
* @param mixed $rule 验证规则
* @param array $data 数据
* @return bool
*/
protected function egt($value, $rule)
{
return $value >= $rule;
return !is_null($this->getDataValue($data, $rule)) && $value >= $this->getDataValue($data, $rule);
}
/**
@@ -468,11 +469,12 @@ class Validate
* @access protected
* @param mixed $value 字段值
* @param mixed $rule 验证规则
* @param array $data 数据
* @return bool
*/
protected function gt($value, $rule)
{
return $value > $rule;
return !is_null($this->getDataValue($data, $rule)) && $value > $this->getDataValue($data, $rule);
}
/**
@@ -480,11 +482,12 @@ class Validate
* @access protected
* @param mixed $value 字段值
* @param mixed $rule 验证规则
* @param array $data 数据
* @return bool
*/
protected function elt($value, $rule)
{
return $value <= $rule;
return !is_null($this->getDataValue($data, $rule)) && $value <= $this->getDataValue($data, $rule);
}
/**
@@ -492,11 +495,12 @@ class Validate
* @access protected
* @param mixed $value 字段值
* @param mixed $rule 验证规则
* @param array $data 数据
* @return bool
*/
protected function lt($value, $rule)
protected function lt($value, $rule, $data)
{
return $value < $rule;
return !is_null($this->getDataValue($data, $rule)) && $value < $this->getDataValue($data, $rule);
}
/**
@@ -504,11 +508,12 @@ class Validate
* @access protected
* @param mixed $value 字段值
* @param mixed $rule 验证规则
* @param array $data 数据
* @return bool
*/
protected function eq($value, $rule)
protected function eq($value, $rule, $data)
{
return $value == $rule;
return !is_null($this->getDataValue($data, $rule)) && $value == $this->getDataValue($data, $rule);
}
/**
@@ -1190,8 +1195,8 @@ class Validate
// 支持二维数组验证
list($name1, $name2) = explode('.', $key);
$value = isset($data[$name1][$name2]) ? $data[$name1][$name2] : null;
} else {
$value = isset($data[$key]) ? $data[$key] : null;
} else {
$value = is_numeric($key) ? $key : (isset($data[$key]) ? $data[$key] : null);
}
return $value;
}